Conflicts:
	src/lib/Makefile.am
	src/lib/asiolink/Makefile.am
	src/lib/asiolink/tcp_socket.h
	src/lib/asiolink/tests/Makefile.am
	src/lib/nsas/asiolink.h
	src/lib/resolve/recursive_query.cc