Merge branch 'quick_tests'
authorTimothy Manning <tfhmanning@gmail.com>
Sun, 14 Nov 2010 23:20:53 +0000 (12:20 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Sun, 14 Nov 2010 23:20:53 +0000 (12:20 +1300)

Trivial merge