# 
# 
# patch "ChangeLog"
#  from [3b945cb18f2fa26515c14e9485c2f3a2a02c4473]
#    to [7cd030835aaa386807481db9549ee32fad1196f0]
# 
============================================================
--- ChangeLog	3b945cb18f2fa26515c14e9485c2f3a2a02c4473
+++ ChangeLog	7cd030835aaa386807481db9549ee32fad1196f0
@@ -1,13 +1,16 @@
-2006-02-19  Matthew Gregan  <address@hidden>
+2006-02-19  Nathaniel Smith  <address@hidden>
 
-	* testsuite.at: Add a REVERT_TO variant that allows use of
-	alternate databases.
+	* ChangeLog: Fixup after xxdiff lossage.
+
 2006-02-19  Nathaniel Smith  <address@hidden>
 
 	* roster_merge.cc (make_lifecycle_objs): Fix test bug.
 
-2006-02-19  Nathaniel Smith  <address@hidden>
+2006-02-19  Matthew Gregan  <address@hidden>
 
+	* testsuite.at: Add a REVERT_TO variant that allows use of
+	alternate databases.
+
 	* tests/t_netsync_permissions.at: Attempt to avoid a database
 	locking race in this test that is causing spurious failures by
 	using the new REVERT_TO variant to cause revert to be performed