Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb 0.1
authorJosh Triplett <josh@freedesktop.org>
Fri, 28 Apr 2006 23:33:20 +0000 (16:33 -0700)
committerJosh Triplett <josh@freedesktop.org>
Fri, 28 Apr 2006 23:33:20 +0000 (16:33 -0700)

Trivial merge