Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Tue, 6 Mar 2007 23:27:23 +0000 (16:27 -0700)
committerBrian <brian@yutani.localnet.net>
Tue, 6 Mar 2007 23:27:23 +0000 (16:27 -0700)

Trivial merge