Conflicts:
	snf-image-helper/common.sh
	snf-image-host/Makefile.am
	snf-image-host/common.sh.in
	snf-image-host/create
	snf-image-host/defaults