with fixing Conflicts:
	ChangeLog
	src/bin/resolver/main.cc
	src/bin/resolver/resolver.cc
	src/bin/resolver/resolver_messages.mes
	src/lib/acl/Makefile.am
	src/lib/acl/tests/Makefile.am