Merge branch 'master' into trac2053

author Mukund Sivaraman <muks@isc.org>

Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)

committer Mukund Sivaraman <muks@isc.org>

Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)
author Mukund Sivaraman <muks@isc.org>
Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)
committer Mukund Sivaraman <muks@isc.org>
Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)
diff --cc src/lib/dns/labelsequence.cc
Simple merge
diff --cc src/lib/dns/labelsequence.h
Simple merge
diff --cc src/lib/dns/name.cc
Simple merge
diff --cc src/lib/dns/tests/labelsequence_unittest.cc
Simple merge
author	Mukund Sivaraman <muks@isc.org>
	Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)
committer	Mukund Sivaraman <muks@isc.org>
	Thu, 5 Jul 2012 05:45:10 +0000 (11:15 +0530)
		1	2
src/lib/dns/labelsequence.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dns/labelsequence.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dns/name.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dns/tests/labelsequence_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history