Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Wed, 6 Dec 2006 15:20:57 +0000 (08:20 -0700)
committerBrian <brian@yutani.localnet.net>
Wed, 6 Dec 2006 15:20:57 +0000 (08:20 -0700)

Trivial merge