Conflicts:
	ChangeLog
	src/bin/dhcp4/dhcp4.dox
	src/bin/dhcp6/dhcp6.dox
	src/hooks/dhcp/user_chk/libdhcp_user_chk.dox

 - Configuration backend description updated
 - ChangeLog entry updated

Fixed Conflicts:
	src/bin/d2/tests/Makefile.am

Modifiedl D2CfgMgr.configPermutations test to verify that
parsing error messages contain position information.
Fixed format of one error message in D2CfgMgr that didn't
match. Hopefully, Marcin is happy now.

Surrounded position info in error messages with parens.
Replaced use of vector with map for tracking position values.
General cleanup.

Conflicts:
	ChangeLog
	configure.ac
	src/bin/cmdctl/Makefile.am
	src/bin/cmdctl/botan-certgen.cc
	src/bin/cmdctl/tests/Makefile.am
	src/bin/cmdctl/tests/botan-certgen_test.py
	src/bin/d2/tests/Makefile.am
	src/bin/d2/tests/d2_test.py
	src/bin/dhcp4/tests/Makefile.am
	src/bin/dhcp6/tests/Makefile.am
	src/bin/tests/process_rename_test.py.in

Fixed Mac OS-X/gcc 4.2.1 issued warning on empty bodied
while-loops in new asiolink::IntervalTimer unit tests.

 - cosmetic changes in configure.ac
 - comment in src/lib/testutils/testdata/Makefile.am updated

Conflicts:
	ChangeLog
	doc/guide/bind10-guide.xml

D2 unit test IOSignalTest::hammer was scaled back to accomodate
sluggish VMs.  IOSignaTest::mixedSignals was failing intermittently on
NetBSD VM and was rewritten to test the quantity of signals received
rather than the order.

The unittests IntervalTimerTest.intervalModeTest and
IntervalTimerTest.timerReuseTest were failing under NetBSD VM.
They have been restructured to be less susceptible to timing.