Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/libxcb
authorEamon Walsh <ewalsh@tycho.nsa.gov>
Fri, 7 Dec 2007 21:18:00 +0000 (16:18 -0500)
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>
Fri, 7 Dec 2007 21:18:00 +0000 (16:18 -0500)

Trivial merge