Conflicts:
	src/lib/Makefile.am
	src/lib/config/tests/Makefile.am
	src/lib/config/tests/run_unittests.cc
	src/lib/datasrc/tests/Makefile.am
	src/lib/nsas/tests/Makefile.am
	src/lib/nsas/tests/run_unittests.cc
	src/lib/server_common/tests/Makefile.am
	src/lib/util/Makefile.am