bitkeeper revision 1.1159.258.41 (423088a133TZpmpxQnBtgWzoOWnK2A)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 10 Mar 2005 17:49:21 +0000 (17:49 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 10 Mar 2005 17:49:21 +0000 (17:49 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk


Trivial merge