Merge commit 'origin/gallium-master-merge'

This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c

diff --cc progs/demos/Makefile
Simple merge

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/fbobject.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/main/state.c
Simple merge

diff --cc src/mesa/main/texenvprogram.c
Simple merge

diff --cc src/mesa/main/teximage.c
Simple merge