Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
authorIan Osgood <iosgood@Titania.local>
Thu, 9 Mar 2006 06:57:01 +0000 (22:57 -0800)
committerIan Osgood <iosgood@Titania.local>
Thu, 9 Mar 2006 06:57:01 +0000 (22:57 -0800)

Trivial merge