[master] Merge branch 'trac2382'

with fixing Conflicts for
	src/lib/dns/gen-rdatacode.py.in
	src/lib/dns/rdata.cc
	src/lib/dns/rrparamregistry-placeholder.cc
	src/lib/dns/tests/rdata_hinfo_unittest.cc
	src/lib/dns/tests/rdata_txt_like_unittest.cc

diff --cc src/lib/dns/gen-rdatacode.py.in
index 5f0f2ef9c7abe8c35e650f23133a609d4b4d554d,6a9ff8aca575292d611493e3eaa02317f8904a19..72b7674355e6d4e3b76f8bb329fa101b3c951f1f
--- 1/src/lib/dns/gen-rdatacode.py.in
--- 2/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@@ -24,16 -24,6 +24,16 @@@ from os.path import getmtim
  import re
  import sys
  
- new_rdata_factory_users = []
 +# new_rdata_factory_users[] is a list of tuples of the form (rrtype,
 +# rrclass). Items in the list use the (new) RdataFactory class, and
 +# items which are not in the list use OldRdataFactory class.
 +# Note: rrtype and rrclass must be specified in lowercase in
 +# new_rdata_factory_users.
 +#
 +# Example:
 +#     new_rdata_factory_users = [('a', 'in'), ('a', 'ch'), ('soa', 'generic')]
++new_rdata_factory_users = [('aaaa', 'in')]
 +
  re_typecode = re.compile('([\da-z]+)_(\d+)')
  classcode2txt = {}
  typecode2txt = {}

diff --cc src/lib/dns/rrparamregistry-placeholder.cc
Simple merge