Conflicts:
	src/lib/statistics/counter_dict.cc
	src/lib/statistics/counter_dict.h
	src/lib/statistics/tests/counter_dict_unittest.cc

okayed on jabber.

fix a typo

use a tab before the keyword type.

use two tabs before the committer username.

line is too long

This will fix build failure due to the mixture of these in ?:.  (and in any
event when we can make something const that's generally good to do)

Conflicts:
	src/lib/datasrc/database.cc
	src/lib/datasrc/datasrc_messages.mes

Conflicts:
	ChangeLog

boost/unordered_map.hpp is available since Boost 1.36. we should
consider to check if the header file is present with configure.

This reverts commit 1cd21e93.

also fixed a minor type for entry 338 (as discussed on the dev ML)

- changed udp tests to tcp tests where possible and enabled them
- added some comments about why

This reverts commit 662233a1, reversing
changes made to b41b7dc3.

This reverts commit 8dcf5eeb.

This reverts commit 83ecce54.

Conflicts:
	src/lib/python/isc/bind10/socket_cache.py

Conflicts:
	src/lib/python/isc/bind10/socket_cache.py

Conflicts:
	src/bin/bind10/bind10_src.py.in
	src/bin/bind10/tests/bind10_test.py.in

Conflicts:
	ChangeLog
	src/bin/auth/statistics.cc
	src/bin/auth/statistics.h
	src/lib/Makefile.am