Merge branch 'mesa_7_6_branch'
authorNicolai Hähnle <nhaehnle@gmail.com>
Mon, 21 Sep 2009 11:08:34 +0000 (13:08 +0200)
committerNicolai Hähnle <nhaehnle@gmail.com>
Mon, 21 Sep 2009 11:08:34 +0000 (13:08 +0200)

Trivial merge