Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
authorJosh Triplett <josh@freedesktop.org>
Sat, 29 Apr 2006 18:00:01 +0000 (11:00 -0700)
committerJosh Triplett <josh@freedesktop.org>
Sat, 29 Apr 2006 18:00:01 +0000 (11:00 -0700)

Trivial merge