Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorMarek Olšák <maraeo@gmail.com>
Fri, 11 May 2012 14:42:20 +0000 (16:42 +0200)
committerMarek Olšák <maraeo@gmail.com>
Fri, 11 May 2012 14:42:20 +0000 (16:42 +0200)

Trivial merge