Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 1 Mar 2008 15:35:17 +0000 (02:35 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 1 Mar 2008 15:35:17 +0000 (02:35 +1100)

Trivial merge