Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 25 Jan 2006 16:41:22 +0000 (17:41 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 25 Jan 2006 16:41:22 +0000 (17:41 +0100)
Signed-off-by: Steven Smith, sos22@cam.ac.uk

Trivial merge