Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 14:07:19 +0000 (00:07 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 14:07:19 +0000 (00:07 +1000)

Trivial merge