BIND 10 master, updated. b59d780f0b9fd66c06eb7d06082e41249b778f94 Merge branch 'trac1831'

[BIND 10 source code commits]

The branch, master has been updated
       via  b59d780f0b9fd66c06eb7d06082e41249b778f94 (commit)
       via  47b58321cd15762b9cdd0f09e66e9f5b29e67eec (commit)
      from  ad797b98b8ae4f0f003374c13649147aef3c1a83 (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 b59d780f0b9fd66c06eb7d06082e41249b778f94
Merge: ad797b9 47b5832
Author: Paul Selkirk <pselkirk at isc.org>
Date:   Wed Mar 27 11:25:50 2013 -0400

    Merge branch 'trac1831'

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

Summary of changes:
 AUTHORS                   |    1 +
 src/bin/xfrin/xfrin.py.in |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/AUTHORS b/AUTHORS
index 67cb090..b915e25 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ Michael Graff
 Michal Vaner
 Mukund Sivaraman
 Naoki Kambe
+Paul Selkirk
 Shane Kerr
 Shen Tingting
 Stephen Morris
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 6a718ba..0a67718 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -622,7 +622,7 @@ class XfrinConnection(asyncore.dispatcher):
         it if the constructor raises an exception after opening the socket.
         '''
         self.create_socket(self._master_addrinfo[0], self._master_addrinfo[1])
-        self.setblocking(1)
+        self.socket.setblocking(1)
 
     def _get_zone_soa(self):
         '''Retrieve the current SOA RR of the zone to be transferred.