[Bug 226571] Merge Review: xorg-x11-apps