Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/glapi/descrip.mms
	src/mesa/shader/grammar/descrip.mms

diff --cc src/mesa/glapi/glapi.c
Simple merge

diff --cc src/mesa/main/extensions.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/texformat.c
Simple merge

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

diff --cc src/mesa/shader/arbprogparse.c
Simple merge

diff --cc src/mesa/shader/program.c
Simple merge

diff --cc src/mesa/shader/shader_api.c
Simple merge