Merge rt41973 (util/bindvar.sh errors logged but ignored)

author Francis Dupont <fdupont@isc.org>

Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)

committer Francis Dupont <fdupont@isc.org>

Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)
author Francis Dupont <fdupont@isc.org>
Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)
committer Francis Dupont <fdupont@isc.org>
Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Francis Dupont <fdupont@isc.org>
	Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)
committer	Francis Dupont <fdupont@isc.org>
	Wed, 27 Apr 2016 15:14:38 +0000 (17:14 +0200)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history