Conflicts:
	ChangeLog
	doc/guide/bind10-guide.html
	src/bin/dhcp4/main.cc
	src/lib/dhcp/tests/iface_mgr_unittest.cc

(Trac #2023, git b5fbf8a4)
from jinmei

This fixes problem seen when trying to build on FreeBSD
when the package is already installed (making it hard to upgrade).
I tested this on CentOS system too.
I don't like just re-ordering this but this is a quick hack for the problem.
(Another workaround would be to bump the shared library version
but that doesn't work due to the library has a name conflict with
library in base system. These two points will be resolved later.)

This reverts commit 7cfa4f49.

Not increasing the library shared object version now due
to new issue:
http://bind10.isc.org/ticket/2071

To close to release to have a major change to solve this.

Changed existing interface; see commit
219324e6 about the refactoring.

The error seen was:

[ RUN      ] PerfPkt4Test.RawUnpack
/libexec/ld-elf.so.1: /usr/home/jreed/builder/work/BIND10-cppcheck/20120620073005-FreeBSD8-amd64-GCC/build/tests/tools/perfdhcp/tests/.libs/run_unittests: Undefined symbol "_ZN3isc4dhcp6Option7setDataEN9__gnu_cxx17__normal_iteratorIPKhSt6vectorIhSaIhEEEES9_"

Introduced new InterprocessSync interface.

Error seen when linking for liblog was:

/libexec/ld-elf.so.1:
/usr/home/jreed/builder/work/BIND10-cppcheck/20120620133007-FreeBSD8-amd64-GCC/
build/src/lib/log/.libs/liblog.so.1:
Undefined symbol "_ZTVN3isc4util20InterprocessSyncFileE"

This could also be worked around by reordering if LIBADD, but that had
to be done in multiple places and still doesn't fix real problem.

This reverts commit 95940260.

Introduced new InterprocessSync interface.

This worksaround my git commit check: trailing whitespace.

The docbook stylesheet probably was wrong to do this.

No review. This was very minor.

reworded a few sentence

mention b10-httpd-stats

fix verbose switch definition

mention BIND 10 in opening sentence

add docbook formatting tags; use &mdash too.

minor punctuation and grammar improvements

reword "incompatible" to "mutually exclusive" for some options.

While there I noticed a bug in the manpage: it said --upgrade was
incompatible with --upgrade. I fixed that.

uppercase STDERR

fix a typo.

I didn't get this reviewed, but is mostly minor, simple fixes.

also some minor formatting

This was discussed on jabber.

update date (new features anyways since the old date)
update copyright years
minor rewording
add some docbook tags (but not all noticable in rendered manpage).