Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 29 Jun 2009 17:20:07 +0000 (11:20 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 29 Jun 2009 17:20:07 +0000 (11:20 -0600)

Trivial merge