Conflicts:
	src/lib/asiolink/dns_service.cc
	src/lib/asiolink/interval_timer.cc
	src/lib/asiolink/io_service.cc
	src/lib/asiolink/recursive_query.cc
	src/lib/asiolink/tcp_server.cc
	src/lib/asiolink/udp_query.cc
	src/lib/asiolink/udp_server.cc