Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Thu, 20 Mar 2008 13:11:25 +0000 (00:11 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Thu, 20 Mar 2008 13:11:25 +0000 (00:11 +1100)

Trivial merge