[master] Merge branch 'trac963'

diff --cc configure.ac
Simple merge

diff --cc src/bin/xfrout/b10-xfrout.8
index 483e2c05f8d2269b29246bb89b7756e6a1ab7046,69682a32357c7bf6f1f3f01a4d007f84fd8c68df..b3200b588f0a09c3fbebfd930b455e0967bd6c8b
--- 1/src/bin/xfrout/b10-xfrout.8
--- 2/src/bin/xfrout/b10-xfrout.8
+++ b/src/bin/xfrout/b10-xfrout.8
@@@ -7,8 -7,17 +7,17 @@@
  .\"    Source: BIND10
  .\"  Language: English
  .\"
 -.TH "B10\-XFROUT" "8" "February 28\&. 2012" "BIND10" "BIND10"
 +.TH "B10\-XFROUT" "8" "March 16\&. 2012" "BIND10" "BIND10"
  .\" -----------------------------------------------------------------
+ .\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ .\" http://bugs.debian.org/507673
+ .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ .ie \n(.g .ds Aq \(aq
+ .el       .ds Aq '
+ .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
  .\" disable hyphenation