Merge branch 'master' into lukeh/moonshot
authorLuke Howard <lukeh@padl.com>
Tue, 22 Mar 2011 04:45:12 +0000 (15:45 +1100)
committerLuke Howard <lukeh@padl.com>
Tue, 22 Mar 2011 04:45:12 +0000 (15:45 +1100)

Trivial merge