Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 7 May 2009 15:46:53 +0000 (09:46 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 7 May 2009 15:46:53 +0000 (09:46 -0600)

Trivial merge