bitkeeper revision 1.1159.223.48 (41f9204fFDaBv7jCdF63bwx5zXNlNA)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 27 Jan 2005 17:09:35 +0000 (17:09 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 27 Jan 2005 17:09:35 +0000 (17:09 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-2.0-testing.bk


Trivial merge