Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 9 Jul 2009 14:05:56 +0000 (08:05 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 9 Jul 2009 14:05:56 +0000 (08:05 -0600)

Trivial merge