Mesa (master): Merge branch 'mesa_7_6_branch'

[Nicolai Hähnle]

Module: Mesa
Branch: master
Commit: 5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Wed Oct  7 20:39:22 2009 +0200

Merge branch 'mesa_7_6_branch'

---