bitkeeper revision 1.891.1.4 (409a515fvYrN2PDD2do1No81KM0mcA)
authormaw48@labyrinth.cl.cam.ac.uk <maw48@labyrinth.cl.cam.ac.uk>
Thu, 6 May 2004 14:53:19 +0000 (14:53 +0000)
committermaw48@labyrinth.cl.cam.ac.uk <maw48@labyrinth.cl.cam.ac.uk>
Thu, 6 May 2004 14:53:19 +0000 (14:53 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/homes/maw48/xen-nonpriv-io.bk


Trivial merge