Conflicts:
	components/ahttpd/images/steps/auth.png
	components/ahttpd/images/steps/bacula-restore-search.png
	components/ahttpd/images/steps/datetime.png
	components/ahttpd/images/steps/finish.png
	components/ahttpd/images/steps/greeting.png
	components/ahttpd/images/steps/grub.png
	components/ahttpd/images/steps/install.png
	components/ahttpd/images/steps/install2-basesystem.png
	components/ahttpd/images/steps/lilo.png
	components/ahttpd/images/steps/net-eth.png
	components/ahttpd/images/steps/notes-license.png
	components/ahttpd/images/steps/notes-release-notes.png
	components/ahttpd/images/steps/pkg-groups.png
	components/ahttpd/images/steps/preinstall.png
	components/ahttpd/images/steps/root.png
	components/ahttpd/images/steps/sysconfig-base.png
	components/ahttpd/images/steps/sysconfig-kbd.png
	components/ahttpd/images/steps/sysconfig-language.png
	components/ahttpd/images/steps/user.png
	components/ahttpd/images/steps/users.png
	components/ahttpd/images/steps/vm.png
	components/ahttpd/images/steps/x11.png