Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 26 May 2008 14:59:41 +0000 (00:59 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 26 May 2008 14:59:41 +0000 (00:59 +1000)

Trivial merge