From: Brian Paul <brianp@vmware.com>
Date: Sun, 20 Sep 2009 16:36:45 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebf2710b2fd21ae9a6604c015ca7a948589f5a8c;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:
	src/mesa/drivers/dri/intel/intel_clear.c
---

ebf2710b2fd21ae9a6604c015ca7a948589f5a8c