kaf24@scramble.cl.cam.ac.uk 5f53c9cfb8 bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q) ...

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>

2005-03-13 09:39:14 +00:00

..

logging

bitkeeper revision 1.1108.1.8 (40ffc44fV2fs0W-8bRw5B0XcBdmAsw)

2004-07-22 13:42:39 +00:00

xen

bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q)

2005-03-13 09:39:14 +00:00

Makefile

bitkeeper revision 1.1159.270.4 (42330defA42oRGAfkwmQERgN45uyOg)

2005-03-12 15:42:39 +00:00

setup.py

bitkeeper revision 1.1159.1.525 (41d58ba8VgPwkfEiKrUXF8b7LLwQ5Q)

2004-12-31 17:26:00 +00:00