Conflicts:
	src/bin/auth/auth_srv.h
	src/bin/resolver/resolver.h
	src/lib/Makefile.am
	src/lib/asiodns/dns_lookup.h
	src/lib/asiodns/io_fetch.cc
	src/lib/asiodns/io_fetch.h
	src/lib/asiodns/qid_gen.cc
	src/lib/asiodns/qid_gen.h
	src/lib/asiodns/tcp_server.cc
	src/lib/asiodns/tests/qid_gen_unittest.cc
	src/lib/asiodns/udp_server.cc
	src/lib/asiolink/Makefile.am
	src/lib/asiolink/qid_gen.cc
	src/lib/asiolink/qid_gen.h
	src/lib/asiolink/tests/Makefile.am
	src/lib/asiolink/tests/qid_gen_unittest.cc
	src/lib/asiolink/tests/tcp_socket_unittest.cc
	src/lib/asiolink/tests/udp_socket_unittest.cc
	src/lib/dns/rdata.h
	src/lib/resolve/recursive_query.cc
	src/lib/resolve/recursive_query.h
	src/lib/resolve/tests/recursive_query_unittest_2.cc
	src/lib/testutils/srv_test.cc
	src/lib/util/Makefile.am
	src/lib/util/io_utilities.h
	src/lib/util/random/qid_gen.cc
	src/lib/util/random/qid_gen.h
	src/lib/util/tests/io_utilities_unittest.cc
	src/lib/util/tests/qid_gen_unittest.cc