Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Mon, 5 Feb 2007 17:29:58 +0000 (10:29 -0700)
committerBrian <brian@yutani.localnet.net>
Mon, 5 Feb 2007 17:29:58 +0000 (10:29 -0700)

Trivial merge