BIND 10 master, updated. 529119357642023c02dc40fd3c07bd2797062ba9 [master] Remove conflict marker, fix object ID

[BIND 10 source code commits]

The branch, master has been updated
       via  529119357642023c02dc40fd3c07bd2797062ba9 (commit)
      from  9e7943a5c72c19247d6ae7e7c264ef37e11d3561 (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 529119357642023c02dc40fd3c07bd2797062ba9
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Feb 28 06:58:04 2011 -0600

    [master] Remove conflict marker, fix object ID

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

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

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 7207719..f06157f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 	Add stop interface into dns server, so we can stop each running
 	server individually. With it, user can reconfigure her running server
 	with different ip address or port.
-	(Trac #388, git ba727c17d3517232a3c40fa3a30c6924a30ed7dc)
+	(Trac #388, git 6df94e2db856c1adc020f658cc77da5edc967555)
 
   180.  [build]     jreed
 	Fix custom DESTDIR for make install.
@@ -57,7 +57,6 @@ bind10-devel-20110224 released on February 24, 2011
 	list and map item addressing, the correct display of actual values,
 	and internal help.
 	(Trac #384, git e5fb3bc1ed5f3c0aec6eb40a16c63f3d0fc6a7b2)
->>>>>>> master
 
   171.  [func]      feng, jerry, jinmei, vorner
 	b10-auth, src/lib/datasrc: in memory data source now works as a