Merge branch 'mesa_7_7_branch'

Conflicts:

	src/mesa/drivers/dri/i965/brw_wm_emit.c

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

diff --cc progs/fp/SConscript
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_sse2.c
Simple merge

diff --cc src/gallium/drivers/nv50/nv50_query.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_state_fs.c
Simple merge

diff --cc src/mesa/Makefile
Simple merge

diff --cc src/mesa/drivers/common/meta.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_wm_emit.c
Simple merge

diff --cc src/mesa/drivers/dri/r600/r600_texstate.c
Simple merge

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

diff --cc src/mesa/tnl/t_vb_program.c
Simple merge