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

Conflicts:

	src/mesa/drivers/dri/common/dri_util.c

diff --cc progs/trivial/Makefile
index 3f26798,1b9a50b..40ee5e8
--- 1/progs/trivial/Makefile
--- 2/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -92,9 -93,12 +93,13 @@@ SOURCES = 
        tri-flat-clip.c \
        tri-flat.c \
        tri-fog.c \
+       tri-fp.c \
+       tri-fp-const-imm.c \
+       tri-lit.c \
        tri-mask-tri.c \
 +      tri-orig.c \
        tri-query.c \
+       tri-repeat.c \
        tri-scissor-tri.c \
        tri-stencil.c \
        tri-tex.c \

diff --cc src/gallium/auxiliary/util/u_math.h
Simple merge