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