Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJamey Sharp <jamey@minilop.net>
Thu, 9 Mar 2006 06:50:48 +0000 (22:50 -0800)
committerJamey Sharp <jamey@minilop.net>
Thu, 9 Mar 2006 06:50:48 +0000 (22:50 -0800)

Trivial merge