Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 19:21:23 +0000 (13:21 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 19:21:23 +0000 (13:21 -0600)

Trivial merge