Merge branch 'mesa_7_6_branch'

author Brian Paul <brianp@vmware.com>

Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)

committer Brian Paul <brianp@vmware.com>

Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
author Brian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
committer Brian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
diff --cc src/mesa/drivers/dri/intel/intel_tex_copy.c
Simple merge
diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge
author	Brian Paul <brianp@vmware.com>
	Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
committer	Brian Paul <brianp@vmware.com>
	Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
		1	2
src/mesa/drivers/dri/intel/intel_tex_copy.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	patch \|	diff1 \|	diff2 \|	blob \| history