Merge remote branch 'origin/master' into radeon-rewrite

diff --cc configure.ac
Simple merge

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

diff --cc src/mesa/drivers/dri/r200/r200_vertprog.c
Simple merge

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

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

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