Merge branch 'mesa_7_6_branch'

author Brian Paul <brianp@vmware.com>

Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)

committer Brian Paul <brianp@vmware.com>

Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
author Brian Paul <brianp@vmware.com>
Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
committer Brian Paul <brianp@vmware.com>
Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/mesa/state_tracker/st_cb_drawpixels.c
Simple merge
diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge
author	Brian Paul <brianp@vmware.com>
	Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
committer	Brian Paul <brianp@vmware.com>
	Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	patch \|	diff1 \|	diff2 \|	blob \| history