Merge branch 'master' of git+ssh://geckosenator@git.freedesktop.org/git/mesa/mesa
authorSean D'Epagnier <sean@depagnier.com>
Sat, 17 Feb 2007 00:46:11 +0000 (17:46 -0700)
committerSean D'Epagnier <sean@depagnier.com>
Sat, 17 Feb 2007 00:46:11 +0000 (17:46 -0700)

Trivial merge