# 
# patch "ChangeLog"
#  from [90667f9ed1d88e1dd2bb4b7ba68ecb002fdb666a]
#    to [a35e9161ccf60af32688b61cee32db3f8cc14511]
# 
# patch "netsync.cc"
#  from [7cc76ce0fdfa149338ee4a5ef491ba6809d3367d]
#    to [3b1b777c73280ff5cf94238183aa095ca162c7f4]
# 
===============================================
--- ChangeLog	90667f9ed1d88e1dd2bb4b7ba68ecb002fdb666a
+++ ChangeLog	a35e9161ccf60af32688b61cee32db3f8cc14511
@@ -1,5 +1,10 @@
 2005-08-04  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc (rebuild_merkle_trees): Tweak message ("rebuilding
+	merkle trees" does not mean anything to J. Random User...)
+
+2005-08-04  Nathaniel Smith  <address@hidden>
+
 	* manifest.cc (build_restricted_manifest_map): In 'missing files'
 	error message, explain how to recover.
 
===============================================
--- netsync.cc	7cc76ce0fdfa149338ee4a5ef491ba6809d3367d
+++ netsync.cc	3b1b777c73280ff5cf94238183aa095ca162c7f4
@@ -3623,7 +3623,7 @@
 session::rebuild_merkle_trees(app_state & app,
                               set<utf8> const & branchnames)
 {
-  P(F("rebuilding merkle trees ...\n"));
+  P(F("calculating synchronization set ...\n"));
   for (set<utf8>::const_iterator i = branchnames.begin();
       i != branchnames.end(); ++i)
     L(F("including branch %s") % *i);