Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 28 Apr 2008 23:00:48 +0000 (09:00 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 28 Apr 2008 23:00:48 +0000 (09:00 +1000)

Trivial merge