Merge commit 'origin/mesa_7_7_branch'

author Maciej Cencora <m.cencora@gmail.com>

Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)

committer Maciej Cencora <m.cencora@gmail.com>

Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
author Maciej Cencora <m.cencora@gmail.com>
Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
committer Maciej Cencora <m.cencora@gmail.com>
Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
diff --cc src/gallium/state_trackers/xorg/xorg_xv.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/brw_vtbl.c
Simple merge
author	Maciej Cencora <m.cencora@gmail.com>
	Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
committer	Maciej Cencora <m.cencora@gmail.com>
	Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
		1	2
src/gallium/state_trackers/xorg/xorg_xv.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vtbl.c	patch \|	diff1 \|	diff2 \|	blob \| history