Conflicts:
	contrib/lib/libc/asr/CVS/Entries
	contrib/lib/libc/asr/asr.c
	contrib/lib/libc/asr/asr_debug.c
	contrib/lib/libc/asr/asr_private.h
	contrib/lib/libc/asr/asr_utils.c
	contrib/lib/libc/asr/getaddrinfo.c
	contrib/lib/libc/asr/getaddrinfo_async.c
	contrib/lib/libc/asr/gethostnamadr.c
	contrib/lib/libc/asr/gethostnamadr_async.c
	contrib/lib/libc/asr/getnameinfo.c
	contrib/lib/libc/asr/getnameinfo_async.c
	contrib/lib/libc/asr/getnetnamadr.c
	contrib/lib/libc/asr/getnetnamadr_async.c
	contrib/lib/libc/asr/getrrsetbyname.c
	contrib/lib/libc/asr/getrrsetbyname_async.c
	contrib/lib/libc/asr/res_init.c
	contrib/lib/libc/asr/res_mkquery.c
	contrib/lib/libc/asr/res_query.c
	contrib/lib/libc/asr/res_search_async.c
	contrib/lib/libc/asr/res_send.c
	contrib/lib/libc/asr/res_send_async.c
	mk/smtpd/Makefile.am