Merge branch 'master' of git://anongit.freedesktop.org/~peterh/xcbproto
authorPeter Harris <pharris@opentext.com>
Thu, 23 Dec 2010 18:02:52 +0000 (13:02 -0500)
committerPeter Harris <pharris@opentext.com>
Thu, 23 Dec 2010 18:02:52 +0000 (13:02 -0500)

Trivial merge