Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 23 Mar 2008 03:18:06 +0000 (14:18 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 23 Mar 2008 03:18:06 +0000 (14:18 +1100)

Trivial merge