Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa...
authorBrian <brian@i915.localnet.net>
Mon, 6 Aug 2007 22:18:25 +0000 (16:18 -0600)
committerBrian <brian@i915.localnet.net>
Mon, 6 Aug 2007 22:18:25 +0000 (16:18 -0600)

Trivial merge