bitkeeper revision 1.1236.34.2 (4236f1cenxl0_Wb4JHfN5yqRDIoKOw)

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/vh249/xen-unstable.bk

diff --cc BitKeeper/etc/logging_ok
index d3fabe9b7d9063bfa3f544a11696ab862dad10fb,e671b4583f9e5a888f9e1efb2f9b36880dcd3414..bc6cf5f0de5a04fc2b9445412390dbd7f72b5a5e
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -81,5 -66,5 +81,6 @@@ tlh20@labyrinth.cl.cam.ac.u
  tw275@labyrinth.cl.cam.ac.uk
  tw275@striker.cl.cam.ac.uk
  vh249@airwolf.cl.cam.ac.uk
+ vh249@arcadians.cl.cam.ac.uk
 +xen-ia64.adm@bkbits.net
  xenbk@gandalf.hpl.hp.com

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
Simple merge