diff --git a/ChangeLog b/ChangeLog
index acc088d5b..4ebe59485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-05  Frank Zago  <fzago@greshamstorage.com>
+
+	* backend/umax-usb.c backend/teco1.c backend/matsushita.c
+	backend/matsushita.h backend/leo.c backend/sceptre.c: minor fixes.
+
 2002-05-05  Andras Major <andras@users.sourceforge.net>
 
 	* backend/coolscan2.c: version number replaces "CVS"
@@ -1749,7 +1754,6 @@ i
 
 2001-11-10  Stéphane Voltz  <svoltz@wanadoo.fr>
 
->>>>>>> 1.539
 	* backend/umax_pp_low.c: correct PPC compile problem by removing
 	  buggy extra ifdef