Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[Nicolai Hähnle]

Module: Mesa
Branch: mesa_7_6_branch
Commit: 82c2f7756af19f0a19aeda7ea1f627262e4561c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82c2f7756af19f0a19aeda7ea1f627262e4561c0

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Sun Sep 20 16:59:03 2009 +0200

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---