Conflicts:
	Makefile.in
	branding.spec
	components/bootsplash/config/bootsplash-1024x768.cfg.in
	components/bootsplash/config/bootsplash-640x480.cfg.in
	configure.ac
	gnome-settings/index.theme.in
	graphics/backgrounds/wallpaper.png
	images/background.png
	images/boot.jpg