Merge branch 'quick_tests'
authorTimothy Manning <tfhmanning@gmail.com>
Fri, 26 Nov 2010 00:50:43 +0000 (13:50 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Fri, 26 Nov 2010 00:50:43 +0000 (13:50 +1300)

Trivial merge