Mesa (master): Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/ mesa

[Stephane Marchesin]

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

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Wed Jul 13 11:56:44 2011 -0700

Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

---