Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit

author Keith Whitwell <keithw@vmware.com>

Tue, 30 Jun 2009 15:28:37 +0000 (16:28 +0100)

committer Keith Whitwell <keithw@vmware.com>

Tue, 30 Jun 2009 15:28:54 +0000 (16:28 +0100)
author Keith Whitwell <keithw@vmware.com>
Tue, 30 Jun 2009 15:28:37 +0000 (16:28 +0100)
committer Keith Whitwell <keithw@vmware.com>
Tue, 30 Jun 2009 15:28:54 +0000 (16:28 +0100)
diff --cc progs/trivial/Makefile
Simple merge
diff --cc src/mesa/vbo/vbo_exec_draw.c
Simple merge
author	Keith Whitwell <keithw@vmware.com>
	Tue, 30 Jun 2009 15:28:37 +0000 (16:28 +0100)
committer	Keith Whitwell <keithw@vmware.com>
	Tue, 30 Jun 2009 15:28:54 +0000 (16:28 +0100)
		1	2
progs/trivial/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_draw.c	patch \|	diff1 \|	diff2 \|	blob \| history