Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 13 Jul 2011 18:56:44 +0000 (11:56 -0700)
committerStéphane Marchesin <marcheu@chromium.org>
Wed, 13 Jul 2011 18:56:44 +0000 (11:56 -0700)

Trivial merge