Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
authorIan Osgood <iano@quirkster.com>
Tue, 14 Mar 2006 19:44:43 +0000 (11:44 -0800)
committerIan Osgood <iano@quirkster.com>
Tue, 14 Mar 2006 19:44:43 +0000 (11:44 -0800)

Trivial merge