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

author Peter Harris <pharris@opentext.com>

Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)

committer Peter Harris <pharris@opentext.com>

Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)
author Peter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)
committer Peter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)
diff --cc configure.ac
Simple merge
diff --cc src/xcb_util.c
Simple merge
author	Peter Harris <pharris@opentext.com>
	Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)
committer	Peter Harris <pharris@opentext.com>
	Wed, 8 Sep 2010 18:41:52 +0000 (14:41 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/xcb_util.c	patch \|	diff1 \|	diff2 \|	blob \| history