Conflicts:
	branding.spec
	components.mk
	components/ahttpd/styles/alterator.css.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.ini.in
	components/indexhtml/index.css.in
	components/indexhtml/indexhtml.desktop.in
	configure.ac
	images/boot.jpg
	images/boot.png
	images/installer.png
	images/product-logo.png
	images/wallpaper.png
	notes/index-en.html.in
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in