Wed, 28 Oct 2009 11:42:47 +0100 greg Merge with 5981ad8547f5bcfe2e9c93b7973fbca79178487f