Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 25 Mar 2008 01:14:49 +0000 (12:14 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 25 Mar 2008 01:14:49 +0000 (12:14 +1100)

Trivial merge