Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

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

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

diff --cc src/mesa/swrast/s_fragprog.c
Simple merge