Merge branch 'master' of git://git.qubes-os.org/marmarek/core-admin

qvm-tools/qvm-create

@@ -100,6 +100,9 @@ def main():
     if options.hvm and not options.template:
         options.standalone = True
 
+    if options.hvm_template:
+        options.standalone = True
+
     if options.root is not None and not os.path.exists(options.root):
         print >> sys.stderr, "File specified as root.img does not exists"
         exit (1)