Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorStéphane Marchesin <marcheu@chromium.org>
Tue, 7 Jun 2011 03:42:30 +0000 (20:42 -0700)
committerStéphane Marchesin <marcheu@chromium.org>
Tue, 7 Jun 2011 03:42:30 +0000 (20:42 -0700)

Trivial merge