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