Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 18 Feb 2008 01:45:56 +0000 (12:45 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 18 Feb 2008 01:45:56 +0000 (12:45 +1100)

Trivial merge