Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 1 Oct 2009 19:35:42 +0000 (13:35 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 1 Oct 2009 19:35:42 +0000 (13:35 -0600)

Trivial merge