Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Sun, 31 May 2009 02:10:04 +0000 (20:10 -0600)
committerBrian Paul <brianp@vmware.com>
Sun, 31 May 2009 02:10:04 +0000 (20:10 -0600)

Trivial merge