Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	progs/demos/projtex.c
	progs/xdemos/glxinfo.c
	src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.

diff --cc src/gallium/drivers/r300/Makefile
Simple merge

diff --cc src/mesa/drivers/dri/radeon/radeon_common.c
Simple merge

diff --cc src/mesa/drivers/dri/radeon/radeon_common.h
Simple merge