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

Conflicts:

	src/mesa/main/context.c

diff --cc progs/trivial/Makefile
Simple merge

diff --cc src/mesa/main/context.c
index c6ff8c1,e5ec35c..61c0861
--- 1/src/mesa/main/context.c
--- 2/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@@ -1063,6 -1063,8 +1063,7 @@@ init_attrib_groups(GLcontext *ctx
     /* Miscellaneous */
     ctx->NewState = _NEW_ALL;
     ctx->ErrorValue = (GLenum) GL_NO_ERROR;
 -   ctx->_Facing = 0;
+    ctx->varying_vp_inputs = ~0;
  
     return GL_TRUE;
  }

diff --cc src/mesa/main/ffvertex_prog.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