Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Wed, 28 Feb 2007 18:58:30 +0000 (11:58 -0700)
committerBrian <brian@yutani.localnet.net>
Wed, 28 Feb 2007 18:58:30 +0000 (11:58 -0700)

Trivial merge