From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 28 Sep 2009 19:03:23 +0000 (-0700)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41865d991f5703b6a9faa33ee6ac1d256af5c2a2;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:
	Makefile
	src/mesa/main/version.h
---

41865d991f5703b6a9faa33ee6ac1d256af5c2a2