Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Wed, 14 Mar 2007 18:43:26 +0000 (12:43 -0600)
committerBrian <brian@yutani.localnet.net>
Wed, 14 Mar 2007 18:43:26 +0000 (12:43 -0600)

Trivial merge