From: Jakob Bornecrantz <jakob@vmware.com>
Date: Wed, 2 Dec 2009 13:52:51 +0000 (+0100)
Subject: Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c75854cc1650dc870e042aa66a053e70b3d4556;p=mesa.git

Merge commit 'mesa_7_6_branch' into mesa_7_7_branch

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

0c75854cc1650dc870e042aa66a053e70b3d4556