Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJamey Sharp <jamey@minilop.net>
Tue, 7 Mar 2006 08:26:38 +0000 (00:26 -0800)
committerJamey Sharp <jamey@minilop.net>
Tue, 7 Mar 2006 08:26:38 +0000 (00:26 -0800)

Trivial merge