Conflicts:
	apt/create_instance.in
	apt/manage_profile.in
	backend/newimageid_ez.in
	clientside/tmcc/linux-ms/mfs/slicefix
	utils/create_image.in
	www/aptui/css/jquery-steps.css
	www/aptui/instantiate.php
	www/aptui/js/instantiate.js
	www/aptui/js/status.js
	www/newimageid_ez.php3