Merge commit 'nigel'

Conflicts:

	vserverctl

diff --cc vserverctl
index 7386c123cb0b225b3456b37a553f6b99bc7e3a8c,8c5ddb44f974c34b3f658e6b61225f8b4b0dc479..2cab228eb4b1af2cb164c57bfaf8dddc9a3ed6c9
--- 1/vserverctl
--- 2/vserverctl
+++ b/vserverctl
@@@ -127,12 -111,9 +130,13 @@@ if ( $action eq 'add' ) 
          my $data = slurp($key);
          $data =~ s/__VSNAME__/$vsname/g;
          $data =~ s/__VSIPADDR__/$ipaddr/g;
+         $data =~ s/__HOST__/$hostname/g;
 +        foreach my $key ( keys %{$profileOptions} ) {
 +            my $value = $profileOptions->{$key};
 +            $data =~ s/__PROFILEOPTION_${key}__/$value/g;
 +        }
          write_file($vsroot . '.template', $data);
 -        system('mv', $vsroot . '.template', $vsroot . $templates{$key} . $file);
 +        system('mv', $vsroot . '.template', $vsroot . $templates{$key});
      }
  
      open $scriptFH, '|-', 'vserver', $vsname, 'exec', '/bin/bash';