Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Thu, 15 Mar 2007 15:03:03 +0000 (09:03 -0600)
committerBrian <brian@yutani.localnet.net>
Thu, 15 Mar 2007 15:03:03 +0000 (09:03 -0600)

Trivial merge