Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJosh Triplett <josh@freedesktop.org>
Sun, 16 Apr 2006 18:23:52 +0000 (11:23 -0700)
committerJosh Triplett <josh@freedesktop.org>
Sun, 16 Apr 2006 18:23:52 +0000 (11:23 -0700)

Trivial merge