Merge commit 'origin/gallium-0.1' into gallium-0.2

author Brian Paul <brian.paul@tungstengraphics.com>

Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)

committer Brian Paul <brian.paul@tungstengraphics.com>

Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
author Brian Paul <brian.paul@tungstengraphics.com>
Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
committer Brian Paul <brian.paul@tungstengraphics.com>
Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
diff --cc progs/trivial/tri.c
Simple merge
diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge
author	Brian Paul <brian.paul@tungstengraphics.com>
	Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
committer	Brian Paul <brian.paul@tungstengraphics.com>
	Fri, 17 Oct 2008 20:13:00 +0000 (14:13 -0600)
		1	2
progs/trivial/tri.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	patch \|	diff1 \|	diff2 \|	blob \| history