Merge branch 'master' of git+ssh://doursse@git.freedesktop.org/git/xcb
authorTORRI Vincent <torri@doursse.(none)>
Fri, 28 Apr 2006 17:27:33 +0000 (19:27 +0200)
committerTORRI Vincent <torri@doursse.(none)>
Fri, 28 Apr 2006 17:27:33 +0000 (19:27 +0200)

Trivial merge