# 
# 
# patch "ChangeLog"
#  from [8373cfe61b7602d44852e117614932d9bade066e]
#    to [ef517cdcf8338c76749235b7e2fbe20d34d1675f]
# 
============================================================
--- ChangeLog	8373cfe61b7602d44852e117614932d9bade066e
+++ ChangeLog	ef517cdcf8338c76749235b7e2fbe20d34d1675f
@@ -1,7 +1,12 @@
 2006-04-02  Matthew Nicholson  <address@hidden>
 	
+	* ChangeLog: Fix typo and merge goofs.
+
+2006-04-02  Matthew Nicholson  <address@hidden>
+	
 	* debian/monotone-server.monotone.init: Clean up monotone's pid file
-	for it.  The is a temporary work around until monotone learns to clean
+	for it.  This is a temporary work around until monotone learns to
+	clean up after itself.
 
 2006-04-02  Matthew Nicholson  <address@hidden>