[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 0af1ba62a14b4eaf1c0687d855edc7307edb21ba
# Parent  b75574cb80a3ce6a01cc206d61488ab63e7d58e6
# Parent  fa8b2059c5d8b18a07f1d4e2314a9c8bb59023f3
merge
---
 tools/python/xen/xend/XendCheckpoint.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r b75574cb80a3 -r 0af1ba62a14b tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Tue Nov 28 11:46:39 2006 +0000
+++ b/tools/python/xen/xend/XendCheckpoint.py   Tue Nov 28 11:47:28 2006 +0000
@@ -16,7 +16,7 @@ import xen.lowlevel.xc
 import xen.lowlevel.xc
 
 from xen.xend import balloon, sxp
-from xen.xend.XendError import XendError
+from xen.xend.XendError import XendError, VmError
 from xen.xend.XendLogging import log
 from xen.xend.XendConstants import *
 from xen.xend.XendConfig import XendConfig

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog