BIND 10 master, updated. 14d7b2bc8d2d3cbfbaf78d1d9a0492c4705aedd0 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  14d7b2bc8d2d3cbfbaf78d1d9a0492c4705aedd0 (commit)
       via  8af77178bac36566bc64b0df7fe22a2b4494ea42 (commit)
      from  ce374384070155e16216b2624bd89f184993df0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 14d7b2bc8d2d3cbfbaf78d1d9a0492c4705aedd0
Merge: 8af77178bac36566bc64b0df7fe22a2b4494ea42 ce374384070155e16216b2624bd89f184993df0d
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Mar 14 15:56:00 2011 +0000

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

commit 8af77178bac36566bc64b0df7fe22a2b4494ea42
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Mar 14 15:54:49 2011 +0000

    [master] Fix build issue on solaris-gcc

-----------------------------------------------------------------------

Summary of changes:
 src/lib/nsas/zone_entry.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/nsas/zone_entry.cc b/src/lib/nsas/zone_entry.cc
index 36e01d2..b0ad322 100644
--- a/src/lib/nsas/zone_entry.cc
+++ b/src/lib/nsas/zone_entry.cc
@@ -122,7 +122,7 @@ class ZoneEntry::ResolverCallback :
                  * do), so we can just reuse them instead of looking them up in
                  * the table or creating them.
                  */
-                map<string, NameserverPtr> old;
+                std::map<string, NameserverPtr> old;
                 BOOST_FOREACH(const NameserverPtr& ptr, entry_->nameservers_) {
                     old[ptr->getName()] = ptr;
                 }