bitkeeper revision 1.1159.1.66 (4120760aHfbIf2nixUgYmOxeE8yRRg)

Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk

tools/python/xen/xend/XendDomainInfo.py

@@ -465,6 +465,7 @@ class XendDomainInfo:
         @param name: name
         @raise: VMerror if invalid
         """
+        if self.recreate: return
         if name is None or name == '':
             raise VmError('missing vm name')
         if name[0] in string.digits:

tools/python/xen/xm/main.py

@@ -302,7 +302,7 @@ class ProgMigrate(Prog):
     info = """Migrate a domain to another machine."""
 
     def help(self, args):
-        migrate.help(arg)
+        migrate.help(args)
     
     def main(self, args):
         migrate.main(args)