Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 29 Jun 2008 02:16:13 +0000 (12:16 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 29 Jun 2008 02:16:13 +0000 (12:16 +1000)

Trivial merge