Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 27 Apr 2008 08:04:50 +0000 (18:04 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 27 Apr 2008 08:04:50 +0000 (18:04 +1000)

Trivial merge