From: Brian Paul <brianp@vmware.com>
Date: Tue, 26 Jan 2010 20:23:25 +0000 (-0700)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=43867acb6afc7fad26cdc2f22b2a3bb6eeefb2da;p=mesa.git

Merge branch 'mesa_7_7_branch'

Merging was easier than cherry picking in this instance.
---

43867acb6afc7fad26cdc2f22b2a3bb6eeefb2da