Merge remote branch 'origin/master' into glsl2

This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.

Conflicts:
	src/mesa/Makefile
	src/mesa/main/shaderapi.c
	src/mesa/main/shaderobj.h

src/glsl/linker.cpp

@@ -74,11 +74,11 @@ extern "C" {
 
 #include "main/mtypes.h"
 #include "main/macros.h"
+#include "main/shaderobj.h"
 #include "glsl_symbol_table.h"
 #include "ir.h"
 #include "program.h"
 #include "hash_table.h"
-#include "shader_api.h"
 #include "linker.h"
 #include "ir_optimization.h"