Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 04:32:47 +0000 (06:32 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 04:32:47 +0000 (06:32 +0200)

Trivial merge