Conflicts:
	branding.spec
	components/bootloader/gfxboot.cfg.in
	kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in