[Bug 226643] Merge Review: xorg-x11-server