Merge branch 'timothy'
authorTimothy Manning <tfhmanning@gmail.com>
Tue, 26 Oct 2010 04:12:06 +0000 (17:12 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Tue, 26 Oct 2010 04:12:06 +0000 (17:12 +1300)

Trivial merge