Merge remote branch 'origin/gallium-0.2' into gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Mon, 10 Nov 2008 04:53:51 +0000 (15:53 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 10 Nov 2008 04:53:51 +0000 (15:53 +1100)

Trivial merge