[master] Merge branch 'trac1351'

diff --cc doc/guide/bind10-guide.xml
Simple merge

diff --cc src/bin/xfrin/xfrin.py.in
index caae9d7efeb4529d71692a9e31aeea1521bf48b3,811869dfc03f224ced6baa14f9c18c94e0def5a2..da0f20702e522728e2218f7dc2045cf4c8bcdc95
--- 1/src/bin/xfrin/xfrin.py.in
--- 2/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@@ -34,9 -34,10 +34,10 @@@ from isc.datasrc import DataSourceClien
  import isc.net.parse
  from isc.xfrin.diff import Diff
  from isc.server_common.auth_command import auth_loadzone_command
+ from isc.server_common.tsig_keyring import init_keyring, get_keyring
  from isc.log_messages.xfrin_messages import *
  
 -isc.log.init("b10-xfrin")
 +isc.log.init("b10-xfrin", buffer=True)
  logger = isc.log.Logger("xfrin")
  
  # Pending system-wide debug level definitions, the ones we