Merge commit 'origin/master' into gallium-0.2

Conflicts:
	windows/VC8/mesa/osmesa/osmesa.vcproj
	windows/VC8/progs/demos/gears.vcproj
	windows/VC8/progs/progs.sln

diff --cc Makefile
Simple merge

diff --cc progs/tests/Makefile
index b96ad9f4b469536186803f6c26c52f2984d4b746,5f17f88d36cf94599a0616f60264db4575df1cb8..34c9ab1dcef28a3038b71a9840e2fdc408080d28
--- 1/progs/tests/Makefile
--- 2/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@@ -62,9 -59,9 +63,10 @@@ SOURCES = 
        pbo.c \
        prog_parameter.c \
        projtex.c \
 +      quads.c \
        random.c \
        readrate.c \
+       rubberband.c \
        seccolor.c \
        shader_api.c \
        sharedtex.c \

diff --cc src/mesa/drivers/dri/common/dri_util.h
Simple merge

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

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

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

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

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

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