Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

Conflicts:
	ChangeLog

diff --cc ChangeLog
index e05334190aa01be5693e53b3b4d5ae382b41f78e,f1f8a9ca0e9c1ab5406b2287624e889bfebb2e6c..15293dfc07a2bf8de93e1faac08b822eee22586a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
- 299.    [func]*         tomek
++300.    [func]*         tomek
 +      libdhcp: DHCP packet library was implemented. Currently it handles
 +      packet reception, option parsing, option generation and output
 +      packet building. Generic and specialized classes for several
 +      DHCPv6 options (IA_NA, IAADDR, address-list) are available. A
 +      simple code was added that leverages libdhcp. It is a skeleton
 +      DHCPv6 server. It receives incoming SOLICIT and REQUEST messages
 +      and responds with proper ADVERTISE and REPLY. Note that since
 +      LeaseManager is not implemented, server assigns a the same
 +      hardcoded lease for every client.
 +
+ 299.  [build]         jreed
+       Do not install the libfake_session, libtestutils, or libbench
+       libraries. They are used by tests within the source tree.
+       Convert all test-related makefiles to build test code at
+       regular make time to better work with test-driven development.
+       This reverts some of #1901. (The tests are ran using "make
+       check".)
+       (Trac #1286, git cee641fd3d12341d6bfce5a6fbd913e3aebc1e8e)
+ 
  bind10-devel-20111014 released on October 14, 2011
  
  298.  [doc]           jreed