Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Sun, 5 Jul 2009 02:14:41 +0000 (04:14 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Sun, 5 Jul 2009 02:14:41 +0000 (04:14 +0200)

Trivial merge