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

diff --cc progs/trivial/Makefile
index 40ee5e81c41a198ce71d767e541d2ec6ecb5f533,cfe7fe6f31ed2a6db53e3dded4c0eec23cf847b3..f7bfd1f039d8a360bd60c374cf15f3e12b15b488
--- 1/progs/trivial/Makefile
--- 2/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -76,7 -75,9 +76,8 @@@ SOURCES = 
        quadstrip-cont.c \
        quadstrip-flat.c \
        quadstrip.c \
 -      tri-orig.c \
        tri-alpha.c \
+       tri-array-interleaved.c \
        tri-blend-color.c \
        tri-blend-max.c \
        tri-blend-min.c \

diff --cc src/gallium/auxiliary/draw/draw_context.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_context.h
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_private.h
Simple merge

diff --cc src/mesa/state_tracker/st_framebuffer.c
Simple merge