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

fix conflict

diff --cc ChangeLog
index f8d91a59ce046d2247f913635c2b81ba1d4d19e7,0889ff7c6792cbd628950ad51ae7ba36115492f6..5552772fbd1705bdb1ab9486eac98e2fce340881
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,9 +1,11 @@@
 +bind10-1.0.0beta2 released on May 3, 2013
 +
+ 610.  [bug]           muks
+       When the sqlite3 program is not available on the system (in
+       PATH), we no longer attempt to run some tests which depend
+       on it.
+       (Trac #1909, git f85b274b85b57a094d33ca06dfbe12ae67bb47df)
+ 
  609.  [bug]           jinmei
        Handled some rare error cases in DNS server classes correctly.
        This fix specifically solves occasional crash of b10-auth due to

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge