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

Trivial merge