fix templates to, you know, be usable :)

Signed-off-by: Wolf Noble <wnoble@datapipe.com>
fix templates to, you know, be usable :)

Signed-off-by: Wolf Noble <wnoble@datapipe.com>
Merge branch 'master' of cvs.wolfspaw.com:root/wolfspyre-xenserver

Signed-off-by: Wolf Noble <wnoble@datapipe.com>

Conflicts:
	templates/usr/local/etc/mailheader.txt.erb.txt
	templates/usr/local/scripts/cleanup.sh.erb
	templates/usr/local/scripts/meta-backup.sh.erb
fixing templates.

Signed-off-by: Wolf Noble <wnoble@datapipe.com>
remove superfluous ordering

Signed-off-by: Wolf Noble <wnoble@datapipe.com>
fixes

Signed-off-by: Wolf Noble <wnoble@datapipe.com>