Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/state_tracker/st_cb_bufferobjects.c

diff --cc configure.ac
Simple merge

diff --cc progs/tests/Makefile
Simple merge

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

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

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

diff --cc src/mesa/state_tracker/st_cb_bufferobjects.c
Simple merge

diff --cc src/mesa/vbo/vbo_exec_api.c
Simple merge