BIND 10 master, updated. 9bedc5ab8526c5da673786e93025ebd42c63b597 Merge branch 'master' into trac2120

[BIND 10 source code commits]

The branch, master has been updated
       via  9bedc5ab8526c5da673786e93025ebd42c63b597 (commit)
       via  f0775ced0288086ed47ebfa0bba4be278dec2499 (commit)
      from  73ef6ee5e29c771dac91d5bc453f8daa544ce9ba (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 9bedc5ab8526c5da673786e93025ebd42c63b597
Merge: f0775ce 73ef6ee
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jul 23 10:27:09 2012 +0530

    Merge branch 'master' into trac2120

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

Summary of changes:
 src/lib/dns/tests/rdata_tsig_unittest.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/rdata_tsig_unittest.cc b/src/lib/dns/tests/rdata_tsig_unittest.cc
index 76f91a6..c8ee8ac 100644
--- a/src/lib/dns/tests/rdata_tsig_unittest.cc
+++ b/src/lib/dns/tests/rdata_tsig_unittest.cc
@@ -230,7 +230,7 @@ TEST_F(Rdata_TSIG_Test, createFromParams) {
                   any::TSIG(Name("hmac-sha1"), 1286779327, 300, 12,
                             fake_data, 16020, 18, 6, fake_data2)));
 
-    EXPECT_THROW(any::TSIG(Name("hmac-sha256"), 1LLU << 48, 300, 12,
+    EXPECT_THROW(any::TSIG(Name("hmac-sha256"), 1ULL << 48, 300, 12,
                            fake_data, 16020, 18, 6, fake_data2),
                  isc::OutOfRange);
     EXPECT_THROW(any::TSIG(Name("hmac-sha256"), 0, 300, 0, fake_data, 16020,