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

[Stephane Marchesin]

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

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Mon Jun  6 20:42:30 2011 -0700

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

---