Conflicts:
	ChangeLog

Conflicts:
	ChangeLog

Conflicts:
	src/lib/python/isc/ddns/session.py

ignoring the result fixes a scan-build error.  besides, ignore() should be
more appropriate choice for what it intends to do anyway.

without [] the output it seems possible that the output is empty for some
environments.  also clarified that we can ignore the cases where -L isn't
contained at all.

Also explicitly added a note in the "Installation" section referring
to the BIND 10 DHCP database installation and configuration section.

This is not allowed by our coding style. Use the correct message ID
instead (which was previously unused).

fixed Conflicts:
	src/bin/bind10/bind10.in

 commit.

It insists signature match between declarations and definitions even with such
unnecessary qualifiers, and fails to link due to a false-positive
"undefined symbol" at the link time.

with one minor regression fix.

fixed Conflicts:
	src/bin/ddns/tests/ddns_test.py
	src/bin/xfrin/tests/xfrin_test.py
	src/lib/dns/python/tests/zone_checker_python_test.py
	src/lib/python/isc/ddns/tests/session_tests.py

Actually the support was already there.
Renamed the OpenBSD class to NetBSD (since it was first)
and then use it for OpenBSD too (and NetBSD).

This is for ticket #2692. It was reviewed on jabber.