Merge branch 'mesa_7_7_branch'
authorMichel Dänzer <daenzer@vmware.com>
Tue, 8 Dec 2009 11:25:34 +0000 (12:25 +0100)
committerMichel Dänzer <daenzer@vmware.com>
Tue, 8 Dec 2009 11:25:34 +0000 (12:25 +0100)

Trivial merge