Conflicts:
	branding.spec
	images/boot.jpg
	images/wallpaper.png
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in