Merge http://infra-srv1.demorecorder.com/git/free-sw/xcb/proto
authorPeter Harris <pharris@opentext.com>
Mon, 25 Aug 2014 23:31:36 +0000 (19:31 -0400)
committerPeter Harris <pharris@opentext.com>
Mon, 25 Aug 2014 23:34:30 +0000 (19:34 -0400)
See the mailing list for Reviewed-bys.

Thread root is
http://lists.freedesktop.org/archives/xcb/2014-August/009632.html


Trivial merge