Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto
authorPeter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:35:32 +0000 (14:35 -0400)
committerPeter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:38:24 +0000 (14:38 -0400)
Signed-off-by: Peter Harris <pharris@opentext.com>

Trivial merge