Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJamey Sharp <jamey@minilop.net>
Thu, 20 Apr 2006 04:29:36 +0000 (21:29 -0700)
committerJamey Sharp <jamey@minilop.net>
Thu, 20 Apr 2006 04:29:36 +0000 (21:29 -0700)

Trivial merge