[Bug 226636] Merge Review: xorg-x11-drv-void