Merge branch 'python_play'
authorTimothy Manning <tfhmanning@gmail.com>
Wed, 6 Oct 2010 01:55:37 +0000 (14:55 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Wed, 6 Oct 2010 01:55:37 +0000 (14:55 +1300)

Trivial merge