Merge branch 'master' into glsl2

diff --cc configure.ac
Simple merge

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

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

diff --cc src/mesa/program/prog_instruction.h
Simple merge

diff --cc src/mesa/program/prog_print.c
Simple merge