Merge remote branch 'origin/gallium-0.2' into gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Mon, 27 Oct 2008 04:40:33 +0000 (15:40 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 27 Oct 2008 04:40:33 +0000 (15:40 +1100)

Trivial merge