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

[Andre Maasikas]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 0d4a05445c6b47b93269a3829afbe509ffec4817
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d4a05445c6b47b93269a3829afbe509ffec4817

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Tue Dec  8 10:16:14 2009 +0200

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

---