bitkeeper revision 1.1159.223.37 (41f6523c0V0_vPJzozd6Y_LEESYzzA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:05:48 +0000 (14:05 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:05:48 +0000 (14:05 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk


Trivial merge