Merge branch 'mesa_7_5_branch'

author Brian Paul <brianp@vmware.com>

Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)

committer Brian Paul <brianp@vmware.com>

Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
author Brian Paul <brianp@vmware.com>
Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
committer Brian Paul <brianp@vmware.com>
Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
diff --cc configure.ac
Simple merge
diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge
diff --cc src/mesa/vbo/vbo_save_api.c
Simple merge
author	Brian Paul <brianp@vmware.com>
	Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
committer	Brian Paul <brianp@vmware.com>
	Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_save_api.c	patch \|	diff1 \|	diff2 \|	blob \| history