From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 22 Dec 2009 02:27:24 +0000 (-0800)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48302e9b309c7ce218de2e522c91bdc87e61cdbc;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

48302e9b309c7ce218de2e522c91bdc87e61cdbc