Merge commit 'origin/master' into gallium-0.2

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

Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)

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

Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)
author Brian Paul <brian.paul@tungstengraphics.com>
Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)
committer Brian Paul <brian.paul@tungstengraphics.com>
Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)
diff --cc src/mesa/shader/prog_execute.c
Simple merge
diff --cc src/mesa/shader/prog_instruction.h
Simple merge
author	Brian Paul <brian.paul@tungstengraphics.com>
	Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)
committer	Brian Paul <brian.paul@tungstengraphics.com>
	Fri, 7 Nov 2008 00:17:13 +0000 (17:17 -0700)
		1	2
src/mesa/shader/prog_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_instruction.h	patch \|	diff1 \|	diff2 \|	blob \| history