Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 5 May 2009 16:13:13 +0000 (10:13 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 5 May 2009 16:13:13 +0000 (10:13 -0600)

Trivial merge