Local merge of two headed repo.
authorsd386@font.cl.cam.ac.uk <sd386@font.cl.cam.ac.uk>
Fri, 19 Aug 2005 18:12:48 +0000 (18:12 +0000)
committersd386@font.cl.cam.ac.uk <sd386@font.cl.cam.ac.uk>
Fri, 19 Aug 2005 18:12:48 +0000 (18:12 +0000)

Trivial merge