Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 1 May 2009 17:57:00 +0000 (11:57 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 1 May 2009 17:57:00 +0000 (11:57 -0600)

Trivial merge