Merge branch 'master' into code-deduplication

Conflicts:
	bin/xen-create-image
	bin/xen-create-nfs
	bin/xt-create-xen-config

t/hook-inittab.t

@@ -7,7 +7,7 @@
 #
 
 use strict;
-use Test::More 'no_plan', skip_all => '/etc/inittab not present';
+use Test::More;
 use File::Temp;
 use File::Copy;
 
@@ -41,6 +41,7 @@ SKIP: {
 } # SKIP
 
 
+done_testing();
 
 sub testHook
 {