Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
authorIan Osgood <iano@quirkster.com>
Fri, 28 Apr 2006 22:23:39 +0000 (15:23 -0700)
committerIan Osgood <iano@quirkster.com>
Fri, 28 Apr 2006 22:23:39 +0000 (15:23 -0700)

Trivial merge