Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 26 Feb 2008 13:34:31 +0000 (00:34 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 26 Feb 2008 13:34:31 +0000 (00:34 +1100)

Trivial merge