# 
# patch "ChangeLog"
#  from [52847a92b4932d7db3f30f961cc813ede6904486]
#    to [4efd9cfe3cafea37b21a93f2462adcf553b8cc73]
# 
# patch "netsync.cc"
#  from [960ce5ba76ced81ff99bbf6a4872da168a74bd42]
#    to [356f622b68dcfef9265dad15a8c988f2ea62741f]
# 
===============================================
--- ChangeLog	52847a92b4932d7db3f30f961cc813ede6904486
+++ ChangeLog	4efd9cfe3cafea37b21a93f2462adcf553b8cc73
@@ -1,3 +1,9 @@
+2005-07-20  Nathaniel Smith  <address@hidden>
+
+	* netsync.cc (rebuild_merkle_trees): Make 'including branch'
+	message L() instead of P(); it's nice information, but too much to
+	be useful with large databases.
+
 2005-07-20  Marcel van der Boom  <address@hidden>
 
 	* database.{cc,hh} (get_branches): New method.
===============================================
--- netsync.cc	960ce5ba76ced81ff99bbf6a4872da168a74bd42
+++ netsync.cc	356f622b68dcfef9265dad15a8c988f2ea62741f
@@ -3642,7 +3642,7 @@
   P(F("rebuilding merkle trees ...\n"));
   for (set<utf8>::const_iterator i = branchnames.begin();
       i != branchnames.end(); ++i)
-    P(F("including branch %s") % *i);
+    L(F("including branch %s") % *i);
 
   boost::shared_ptr<merkle_table> ctab = make_root_node(*this, cert_item);
   boost::shared_ptr<merkle_table> ktab = make_root_node(*this, key_item);