Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

src/lib/nsas/zone_entry.cc

@@ -143,7 +143,7 @@ class ZoneEntry::ResolverCallback :
                         Name ns_name(dynamic_cast<const rdata::generic::NS&>(
                             iterator->getCurrent()).getNSName());
                         // Try to find it in the old ones
-                        map<string, NameserverPtr>::iterator old_ns(old.find(
+                        std::map<string, NameserverPtr>::iterator old_ns(old.find(
                             ns_name.toText()));
                         /*
                          * We didn't have this nameserver before. So we just