Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Thu, 18 Sep 2008 03:14:36 +0000 (13:14 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Thu, 18 Sep 2008 03:14:36 +0000 (13:14 +1000)

Trivial merge