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

Conflicts:
	ChangeLog

ChangeLog

@@ -8,6 +8,18 @@
 	resending statistics data via bindctl manually.
 	(Trac #521, git tbdtbdtbdtbdtbdtbdtbdtbdtbdtbdtbdtbdtbd)
 
+  197.  [bug]		zhang likun
+	Remove expired message and rrset entries when looking up them
+	in cache, touch or remove the rrset entry in cache properly
+	when doing lookup or update.
+	(Trac #661, git 9efbe64fe3ff22bb5fba46de409ae058f199c8a7)
+
+  196.	[bug]		jinmei
+	b10-auth, src/lib/datasrc: the backend of the in-memory data
+	source could not handle the root name.  As a result b10-auth could
+	not work as a root server when using the in-memory data source.
+	(Trac #683, git 420ec42bd913fb83da37b26b75faae49c7957c46)
+
   195.  [func]      stephen
 	Resolver will now re-try a query over TCP if a response to a UDP
 	query has the TC bit set.