Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/main/config.h

diff --cc src/mesa/main/config.h
index e29964a,424ed60..ec7e156
--- 1/src/mesa/main/config.h
--- 2/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@@ -180,8 -183,7 +180,8 @@@
  
  /** For any program target/extension */
  /*@{*/
- #define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */
 +#define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
+ #define MAX_PROGRAM_LOCAL_PARAMS 256 /**< per-program constants (power of two) */
  #define MAX_PROGRAM_ENV_PARAMS 128
  #define MAX_PROGRAM_MATRICES 8
  #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4

diff --cc src/mesa/shader/prog_statevars.h
Simple merge

diff --cc src/mesa/shader/slang/slang_link.c
Simple merge