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

Trivial merge