Merge remote branch 'origin/master' into pipe-video

diff --cc configure.ac
Simple merge

diff --cc src/gallium/auxiliary/Makefile
Simple merge

diff --cc src/gallium/auxiliary/SConscript
Simple merge

diff --cc src/gallium/drivers/r600/r600_asm.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_state.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_state_inlines.h
Simple merge

diff --cc src/gallium/drivers/r600/r600_texture.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_screen.c
Simple merge