libX11: Changes to 'master'

[Julien Cristau]

On Wed, Mar 14, 2012 at 17:33:08 -0400, James Cloos wrote:

> Pushed as 62d4295389.
> 
Thanks for the quick fix.

> Thanks for the quick check!
> 
I was looking at http://patchwork.freedesktop.org/patch/3289/, but
it turns out the gtk+ additions stole compose O X for ¤ (why was the
lowercase version not enough?), so I'm not quite sure what to do here.

Cheers,
Julien