Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	progs/util/shaderutil.c
	src/mesa/drivers/dri/r600/r600_context.c
	src/mesa/main/version.h

diff --cc Makefile
Simple merge

diff --cc progs/util/shaderutil.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/i915_context.h
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_buffer_objects.c
Simple merge

diff --cc src/mesa/main/compiler.h
Simple merge