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

Trivial merge