Merge branch 'python_play'
authorTimothy Manning <tfhmanning@gmail.com>
Thu, 7 Oct 2010 22:07:38 +0000 (11:07 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Thu, 7 Oct 2010 22:07:38 +0000 (11:07 +1300)

Trivial merge