Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Mon, 30 Jan 2006 11:56:14 +0000 (12:56 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Mon, 30 Jan 2006 11:56:14 +0000 (12:56 +0100)
Signed-off-by: Steven Smith, sos22@cam.ac.uk

Trivial merge