Conflicts:
	Makefile.in
	components/ahttpd/images/product-logo.png
	images/background16x9.png
	images/background4x3.png
	images/boot.jpg
	images/boot.png
	images/console.jpg
	images/grub.png
	images/installer.png
	images/product-logo.png