Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@yutani.localnet.net>
Thu, 14 Dec 2006 22:20:15 +0000 (15:20 -0700)
committerBrian <brian@yutani.localnet.net>
Thu, 14 Dec 2006 22:20:15 +0000 (15:20 -0700)

Trivial merge