Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian@i915.localnet.net>
Sun, 25 Feb 2007 01:15:45 +0000 (18:15 -0700)
committerBrian <brian@i915.localnet.net>
Sun, 25 Feb 2007 01:15:45 +0000 (18:15 -0700)

Trivial merge