Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJamey Sharp <jamey@minilop.net>
Sun, 19 Feb 2006 07:57:18 +0000 (23:57 -0800)
committerJamey Sharp <jamey@minilop.net>
Sun, 19 Feb 2006 07:57:18 +0000 (23:57 -0800)

Trivial merge