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

[BIND 10 source code commits]

The branch, master has been updated
       via  4e0adcf35398ec9f5c3a7a4b14e9a1aedcf9f66a (commit)
       via  87d5f96fe04dab6de30c733230669703a2429701 (commit)
      from  3336f575aee4072d1d88b05f7db79712384ef2d8 (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 4e0adcf35398ec9f5c3a7a4b14e9a1aedcf9f66a
Merge: 87d5f96 3336f57
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu May 12 11:23:46 2011 -0700

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

commit 87d5f96fe04dab6de30c733230669703a2429701
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu May 12 11:23:23 2011 -0700

    [master] corrected a minor grammar error in a comment line.

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

Summary of changes:
 src/lib/dns/tests/tsigkey_unittest.cc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/tsigkey_unittest.cc b/src/lib/dns/tests/tsigkey_unittest.cc
index 3408d45..dac3c49 100644
--- a/src/lib/dns/tests/tsigkey_unittest.cc
+++ b/src/lib/dns/tests/tsigkey_unittest.cc
@@ -161,8 +161,8 @@ TEST_F(TSIGKeyRingTest, add) {
     EXPECT_EQ(TSIGKeyRing::EXIST, keyring.add(
                   TSIGKey(key_name, TSIGKey::HMACSHA256_NAME(),
                           secret, secret_len)));
-    // keys are identified their names, the same name of key with a different
-    // algorithm would be considered a duplicate.
+    // keys are identified by their names, the same name of key with a
+    // different algorithm would be considered a duplicate.
     EXPECT_EQ(TSIGKeyRing::EXIST, keyring.add(
                   TSIGKey(Name("example.com"), TSIGKey::HMACSHA1_NAME(),
                           secret, secret_len)));