BIND 10 master, updated. 91164ce5585a7d659f73ba86da2ffcae6db2f5e6 Merge branch 'master' into trac1735_2

[BIND 10 source code commits]

The branch, master has been updated
       via  91164ce5585a7d659f73ba86da2ffcae6db2f5e6 (commit)
       via  18aa5359405c164ecda151b43efd125028d3a1ef (commit)
      from  02f76675c5728649d65e63c29f0603d465730281 (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 91164ce5585a7d659f73ba86da2ffcae6db2f5e6
Merge: 18aa535 02f7667
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jun 1 13:06:09 2012 +0530

    Merge branch 'master' into trac1735_2

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

Summary of changes:
 src/bin/ddns/tests/ddns_test.py |    2 ++
 1 file changed, 2 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py
index 395aacc..f5622c6 100755
--- a/src/bin/ddns/tests/ddns_test.py
+++ b/src/bin/ddns/tests/ddns_test.py
@@ -379,6 +379,8 @@ class TestMain(unittest.TestCase):
 
     def __clear_socket(self):
         self.__clear_called = True
+        # Get rid of the socket file too
+        self.__orig_clear()
 
     def check_exception(self, ex):
         '''Common test sequence to see if the given exception is caused.