merge
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 11 Jan 2006 18:26:03 +0000 (19:26 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 11 Jan 2006 18:26:03 +0000 (19:26 +0100)

Trivial merge