Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 24 Jun 2008 18:05:11 +0000 (04:05 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 24 Jun 2008 18:05:11 +0000 (04:05 +1000)

Trivial merge