Merge branch 'mesa_7_7_branch'

Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c

diff --cc Makefile
Simple merge

diff --cc configure.ac
Simple merge

diff --cc progs/demos/readpix.c
Simple merge

diff --cc progs/demos/textures.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_exa.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/i915_texstate.c
Simple merge

diff --cc src/mesa/drivers/dri/r128/r128_tris.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_texstate.c
Simple merge

diff --cc src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savagetris.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_tris.c
Simple merge

diff --cc src/mesa/drivers/dri/unichrome/via_tris.c
Simple merge

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

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

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

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

diff --cc src/mesa/swrast_setup/ss_tritmp.h
Simple merge

diff --cc src/mesa/tnl_dd/t_dd_dmatmp.h
Simple merge

diff --cc src/mesa/tnl_dd/t_dd_tritmp.h
Simple merge