Merge remote branch 'upstream/gallium-0.1' into gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Fri, 4 Jul 2008 14:53:13 +0000 (00:53 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 4 Jul 2008 14:53:13 +0000 (00:53 +1000)

Trivial merge