[PULL] xephyr xcb conversion, code deletion, and bugfixes

[Adam Jackson]

On Tue, 2013-09-03 at 14:38 -0700, Eric Anholt wrote:
> The following changes since commit 94d4e29aedc69431fa9b299ca1b67947173d7a24:
> 
>   Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554) (2013-08-30 14:26:55 +1000)
> 
> are available in the git repository at:
> 
>   git://people.freedesktop.org/~anholt/xserver ephyr-fixes
> 
> for you to fetch changes up to abc2bfca16adcd1e5657d4ce54f4e1335d5ed53f:
> 
>   kdrive: initialize GLX for xephyr (2013-09-03 14:35:39 -0700)

Pretty please? I already have one outstanding merge pending on this
getting in first, and we're only at four weeks to go before the
Halloween feature merge deadline.

- ajax