Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
authorPatrice Mandin <patrice@manoir.racoon.city>
Sun, 14 Jan 2007 18:56:30 +0000 (19:56 +0100)
committerPatrice Mandin <patrice@manoir.racoon.city>
Sun, 14 Jan 2007 18:56:30 +0000 (19:56 +0100)

Trivial merge