Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 15 Apr 2008 03:23:23 +0000 (13:23 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 15 Apr 2008 03:23:23 +0000 (13:23 +1000)

Trivial merge