From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 22 Dec 2009 02:45:31 +0000 (-0800)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4b6b428855e73b35f754a9f64647c6edc1a88fa;p=mesa.git

Merge branch 'mesa_7_7_branch'

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

a4b6b428855e73b35f754a9f64647c6edc1a88fa