Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Thu, 17 May 2007 14:54:08 +0000 (08:54 -0600)
committerBrian <brian@yutani.localnet.net>
Thu, 17 May 2007 14:54:08 +0000 (08:54 -0600)

Trivial merge