From: Brian Paul <brianp@vmware.com>
Date: Thu, 8 Oct 2009 15:28:07 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f67bc2e87255298ac22e8ccd98f482cc62d0ec26;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/common/meta.c
---

f67bc2e87255298ac22e8ccd98f482cc62d0ec26