Merge branch 'master' of git+ssh://anholt@git.freedesktop.org/git/xcb
authorEric Anholt <anholt@FreeBSD.org>
Sun, 19 Feb 2006 06:57:42 +0000 (22:57 -0800)
committerEric Anholt <anholt@FreeBSD.org>
Sun, 19 Feb 2006 06:57:42 +0000 (22:57 -0800)

Trivial merge