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

Trivial merge