Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 14 Oct 2009 15:40:05 +0000 (09:40 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 14 Oct 2009 15:40:05 +0000 (09:40 -0600)

Trivial merge