Merge remote branch 'origin/gallium-0.2' into gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Tue, 30 Sep 2008 01:57:45 +0000 (11:57 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 30 Sep 2008 01:57:45 +0000 (11:57 +1000)

Trivial merge