Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@nostromo.localnet.net>
Sat, 27 Jan 2007 01:55:12 +0000 (18:55 -0700)
committerBrian <brian@nostromo.localnet.net>
Sat, 27 Jan 2007 01:55:12 +0000 (18:55 -0700)

Trivial merge