Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
authorPatrice Mandin <pmandin@caramail.com>
Fri, 6 Jul 2007 22:08:35 +0000 (00:08 +0200)
committerPatrice Mandin <pmandin@caramail.com>
Fri, 6 Jul 2007 22:08:35 +0000 (00:08 +0200)

Trivial merge