Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
authorStéphane Marchesin <marcheu@chromium.org>
Sat, 27 Aug 2011 00:37:25 +0000 (17:37 -0700)
committerStéphane Marchesin <marcheu@chromium.org>
Sat, 27 Aug 2011 00:37:25 +0000 (17:37 -0700)

Trivial merge