Conflicts:
	NEWS
	bin/rpmbs
	bin/rpmcs
	etersoft-build-utils.spec
	share/eterbuild/functions/common
	share/eterbuild/functions/config
	share/eterbuild/functions/rpm