Merge branch 'trac2157_merge'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index ed0c50b855422ab83bc0b1a6dfd1ed66729a155a,c85262fd38186263a3ca0e40318275752140dfbc..410ebd0fb9c4ff4a89a33074413aa0b33ddde114
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,11 +1,20 @@@
 -TBD.  [func]*         y-aharen
++581.  [func]*         y-aharen
+       Added statistics items in b10-auth based on
+       http://bind10.isc.org/wiki/StatisticsItems. Qtype counters are
+       dropped as it requires further spec design discussion.
+       (Trac #2154, Trac #2155,
+                    git 61d7c3959eb991b22bc1c0ef8f4ecb96b65d9325)
+       (Trac #2157, git TBD)
+ 
 +bind10-1.0.0-rc released on February 14, 2013
 +
 +580.  [func]*         muks
 +      There is no longer a default user account. The old default account
 +      with username 'root' has been removed. In a fresh installation of
 +      BIND 10, the administrator has to configure a user account using
 +      the b10-cmdctl-usermgr program.
 +      (Trac #2641, git 54e8f4061f92c2f9e5b8564240937515efa6d934)
 +
  579.  [bug]           jinmei
        libdatasrc/b10-auth: corrected some corner cases in query handling
        of in-memory data source that led to the following invalid/odd

diff --cc configure.ac
Simple merge

diff --cc src/bin/auth/b10-auth.xml.pre
Simple merge

diff --cc src/bin/auth/tests/auth_srv_unittest.cc
Simple merge