Merge branch 'master' into gallium-0.2

Conflicts:

	src/mesa/glapi/glapi.h
	src/mesa/main/api_exec.c
	src/mesa/main/attrib.c
	src/mesa/main/clear.c
	src/mesa/main/context.c
	src/mesa/main/mfeatures.h
	src/mesa/main/mipmap.c
	src/mesa/main/mipmap.h
	src/mesa/main/readpix.c
	src/mesa/main/sources
	src/mesa/main/state.c
	src/mesa/main/texformat.c
	src/mesa/main/texparam.c
	src/mesa/main/texstate.c
	src/mesa/vbo/vbo_context.c
	src/mesa/x86/common_x86_asm.S

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

diff --cc src/mesa/main/sources
index 468121bd1dcc5ac91c27052d5d8b84e24ad6dc8d,eb8cd900ee5c3b837a529fbf61c668b3da10ecf8..6a165f1ae26656b566ace2d676e09cc78933a4d5
--- 1/src/mesa/main/sources
--- 2/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@@ -78,6 -78,7 +78,10 @@@ vsnprintf.
  MESA_MAIN_HEADERS = \
  accum.h \
  api_arrayelt.h \
++<<<<<<< HEAD:src/mesa/main/sources
++=======
+ api_eval.h \
++>>>>>>> master:src/mesa/main/sources
  api_exec.h \
  api_loopback.h \
  api_noop.h \

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

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

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

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

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

diff --cc src/mesa/x86/common_x86_asm.S
index 09c86b05ba831dc1c8e8fa650a03a065325194a9,ea4047a0e140c31f9ab937479623057459731bb7..a681ff9b9ebfafcc0a93217867c2fb67da08570a
--- 1/src/mesa/x86/common_x86_asm.S
--- 2/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@@ -39,6 -39,7 +39,10 @@@
   * in there will break the build on some platforms.
   */
  
++<<<<<<< HEAD:src/mesa/x86/common_x86_asm.S
++=======
+ #include "matypes.h"
++>>>>>>> master:src/mesa/x86/common_x86_asm.S
  #include "assyntax.h"
  #include "common_x86_features.h"