Conflicts:
	src/lib/dns/gen-rdatacode.py.in
	src/lib/dns/messagerenderer.cc
	src/lib/dns/messagerenderer.h
	src/lib/dns/name.h
	src/lib/dns/rdata.h
	src/lib/dns/rrtype-placeholder.h