Merge branch 'mesa_7_6_branch'
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Sep 2009 20:14:38 +0000 (13:14 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Sep 2009 20:14:38 +0000 (13:14 -0700)

Trivial merge