Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Tue, 13 Jun 2006 14:19:50 +0000 (15:19 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Tue, 13 Jun 2006 14:19:50 +0000 (15:19 +0100)

Trivial merge