Mesa (master): Merge branch 'mesa_7_6_branch'

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Mon Sep 21 13:08:34 2009 +0200

Merge branch 'mesa_7_6_branch'

---