Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 19 Mar 2008 11:51:17 +0000 (22:51 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 19 Mar 2008 11:51:17 +0000 (22:51 +1100)

Trivial merge