Mesa (master): Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 48302e9b309c7ce218de2e522c91bdc87e61cdbc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48302e9b309c7ce218de2e522c91bdc87e61cdbc

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Dec 21 18:27:24 2009 -0800

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	scons/gallium.py
	scons/generic.py
	src/mesa/main/version.h

---