Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Sat, 6 Jan 2007 21:55:07 +0000 (14:55 -0700)
committerBrian <brian@yutani.localnet.net>
Sat, 6 Jan 2007 21:55:07 +0000 (14:55 -0700)

Trivial merge