Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 2 Mar 2008 04:42:53 +0000 (15:42 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 2 Mar 2008 04:42:53 +0000 (15:42 +1100)

Trivial merge