Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/groups/firewall.png
	components/indexhtml/index-ru.html.in
	components/indexhtml/indexhtml.desktop.in
	images/installer.png
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in