Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 1 Apr 2008 14:37:12 +0000 (00:37 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 1 Apr 2008 14:37:12 +0000 (00:37 +1000)

Trivial merge