[1213] Merge branch 'master' into trac1213

Conflicts:
	tests/system/cleanall.sh

diff --cc configure.ac
Simple merge

diff --cc tests/system/cleanall.sh
index f06769648c240ce55cf6d1184a3c001fbaa3f471,d23d103882564f7b054233c5f0345814ca2d8ed9..434c6b136145a82e2e1f0af2672abdedd497d9a7
--- 1/tests/system/cleanall.sh
--- 2/tests/system/cleanall.sh
+++ b/tests/system/cleanall.sh
@@@ -27,7 -27,10 +27,10 @@@ find . -type f \( 
  
  status=0
  
- for d in `find . -maxdepth 2 -mindepth 1 -type d -print`
 -for d in ./.* ./*
++for d in ./.* ./* ./*/*
  do
+    case $d in ./.|./..) continue ;; esac
+    test -d $d || continue
+ 
     test ! -f $d/clean.sh || ( cd $d && sh clean.sh )
  done

diff --cc tests/system/ixfr/clean_ns.sh
index 8f6634fc40eda095edcfb30ac1dcfcd321bcf4df,0000000000000000000000000000000000000000..88f4ff1f7d3392ca428af2dc843cd91363ec06d5
mode 100644,000000..100644
--- 1/tests/system/ixfr/clean_ns.sh
--- /dev/null
+++ b/tests/system/ixfr/clean_ns.sh
@@@ -1,27 -1,0 +1,28 @@@
- rm -f ns1/db.example
 +#!/bin/sh
 +#
 +# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 +#
 +# Permission to use, copy, modify, and/or distribute this software for any
 +# purpose with or without fee is hereby granted, provided that the above
 +# copyright notice and this permission notice appear in all copies.
 +#
 +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
 +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 +# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
 +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 +# PERFORMANCE OF THIS SOFTWARE.
 +
 +# Clean up nameserver directories after zone transfer tests.
 +
 +rm -f ns1/named.conf
++rm -f ns1/db.example*
 +rm -f ns1/named.memstats
 +
 +rm -f nsx2/bind10.run
++rm -f nsx2/b10-config.db
 +rm -f ../zone.sqlite3
 +
 +rm -f client.dig
 +rm -f server.dig