Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 11 Aug 2008 06:07:56 +0000 (16:07 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 11 Aug 2008 06:07:56 +0000 (16:07 +1000)

Trivial merge