Merge branch 'master' into trac2168

Conflicts:
	src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
	src/lib/dns/tests/rdata_nsecbitmap_unittest.cc

diff --cc src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index e7962dd080a9acf28f4536182dd9c932dd3f10ab,23461805af554b73533a24a1781876827a2f569e..ea38e7c4752446cf965c95e41c32dd3f58a59202
--- 1/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
--- 2/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
@@@ -28,10 -27,10 +28,11 @@@
  #include <vector>
  
  using namespace std;
 -using isc::UnitTestUtil;
  using namespace isc::dns;
  using namespace isc::dns::rdata;
+ using namespace isc::util;
 +using isc::UnitTestUtil;
 +using isc::util::unittests::matchWireData;
  
  namespace {
  

diff --cc src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
index c057b58004deffa19ea04876935ea8b93c4241e5,0af1a12f9ab5e471d9e404a4882307b37304c060..9c2420075a8f2d0a5febfac439df961b7176ccf6
--- 1/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
--- 2/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
@@@ -31,11 -30,11 +31,12 @@@
  #include <vector>
  
  using namespace std;
 -using boost::lexical_cast;
 -using isc::UnitTestUtil;
  using namespace isc::dns;
  using namespace isc::dns::rdata;
+ using namespace isc::util;
 +using isc::UnitTestUtil;
 +using isc::util::unittests::matchWireData;
 +using boost::lexical_cast;
  
  namespace {