BIND 10 master, updated. d916aef6af6bb8506b1ff4756054a1697410982f Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  d916aef6af6bb8506b1ff4756054a1697410982f (commit)
       via  4700bada6282f5ad10b53cd8ca7cc03b8fea791d (commit)
      from  ef64723fe9638f8d56f58fba44a149ac620eadd9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d916aef6af6bb8506b1ff4756054a1697410982f
Merge: 4700bada6282f5ad10b53cd8ca7cc03b8fea791d ef64723fe9638f8d56f58fba44a149ac620eadd9
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Aug 25 11:14:50 2011 +0200

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

commit 4700bada6282f5ad10b53cd8ca7cc03b8fea791d
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Aug 25 11:14:42 2011 +0200

    [master] changelog entry

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index c7e6d62..a71c8a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+285.	[bug]		jelte
+	sqlite3 data source: fixed a race condition on initial startup,
+	when the database has not been initialized yet, and multiple
+	processes are trying to do so, resulting in one of them failing.
+	(Trac #326, git 5de6f9658f745e05361242042afd518b444d7466)
+
 284.	[bug]		jerry
 	b10-zonemgr: zonemgr will not terminate on empty zones, it will
 	log a warning and try to do zone transfer for them.