merge of '6ff348260412742b1d440ddecd4bbe3ad5355017'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Sun, 24 Sep 2006 08:31:23 +0000 (08:31 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Sun, 24 Sep 2006 08:31:23 +0000 (08:31 +0000)
     and '853612d1f707239077d79c947a58216f3cb87589'


Trivial merge