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

Trivial merge