Merge commit 'origin/parallel_harness' into blead
authorNicholas Clark <nick@ccl4.org>
Tue, 1 Sep 2009 09:54:48 +0000 (10:54 +0100)
committerNicholas Clark <nick@ccl4.org>
Tue, 1 Sep 2009 09:54:48 +0000 (10:54 +0100)

Trivial merge