Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Fri, 29 Feb 2008 02:24:31 +0000 (13:24 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 29 Feb 2008 02:24:31 +0000 (13:24 +1100)

Trivial merge