Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto