Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
authorIan Osgood <iano@quirkster.com>
Thu, 20 Apr 2006 03:45:31 +0000 (20:45 -0700)
committerIan Osgood <iano@quirkster.com>
Thu, 20 Apr 2006 03:45:31 +0000 (20:45 -0700)

Trivial merge