From: Jamey Sharp <jamey@minilop.net>
Date: Thu, 20 Apr 2006 04:29:36 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
X-Git-Tag: 0.1~16
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bbb0940943cfa40716c931a199f3134fae32852;p=free-sw%2Fxcb%2Fdemo

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
---

8bbb0940943cfa40716c931a199f3134fae32852