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

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

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

d39fd9f641df7da77ff6158c5aa249dd90bf420d