BIND 10 master, updated. 355bc5c22b7c83f6d24f0e4268b1eff7d1274655 [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  355bc5c22b7c83f6d24f0e4268b1eff7d1274655 (commit)
       via  02c64383d4f2bd7a7c878f05df3ee2fbb4d10ce3 (commit)
      from  d09952e117b38c8f55a4abbb2f50ddba4874d86b (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 355bc5c22b7c83f6d24f0e4268b1eff7d1274655
Merge: 02c6438 d09952e
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Tue Jun 11 15:10:30 2013 -0500

    [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
    
    edited src/bin/resolver/bench/Makefile.am
    to remove unneeded linking.

commit 02c64383d4f2bd7a7c878f05df3ee2fbb4d10ce3
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Tue Jun 11 15:09:38 2013 -0500

    [master] don't link with -lgtest
    
    remove GTEST_LDADD
    as discussed on jabber
    the benchmark tool doesn't use googletest

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

Summary of changes:
 src/bin/resolver/bench/Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/bench/Makefile.am b/src/bin/resolver/bench/Makefile.am
index e4689fb..346e007 100644
--- a/src/bin/resolver/bench/Makefile.am
+++ b/src/bin/resolver/bench/Makefile.am
@@ -19,7 +19,6 @@ resolver_bench_SOURCES += fake_resolution.h fake_resolution.cc
 resolver_bench_SOURCES += dummy_work.h dummy_work.cc
 resolver_bench_SOURCES += naive_resolver.h naive_resolver.cc
 
-resolver_bench_LDADD  = $(GTEST_LDADD)
-resolver_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+resolver_bench_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 resolver_bench_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la