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

Trivial merge