Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/libxcb
authorJamey Sharp <jamey@minilop.net>
Sun, 13 Mar 2011 16:18:24 +0000 (09:18 -0700)
committerJamey Sharp <jamey@minilop.net>
Sun, 13 Mar 2011 16:33:44 +0000 (09:33 -0700)
Apparently I forgot to push these months ago.


Trivial merge