Merge commit 'origin/master' into gallium-0.2

diff --cc src/mesa/main/ffvertex_prog.c
Simple merge

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

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