diff --git a/ChangeLog b/ChangeLog
index f230f3be0..334574d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2005-08-16  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
 	* backend/snapscan-scsi.c: Make compileable ;-)
+        * backend/snapscan-options.c: Removed //-style comment
 
 2005-08-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
 	
@@ -16,7 +17,7 @@
 	  backend/sm3600-scanutil.c backend/sm3600.c backend/sm3600.h
 	  doc/sane-sm3600.man doc/sane-usb.man:
 	  Removed direct dependence of sm3600 on libusb. Used sanei_usb
-	  instead. Based on patch from François Revol <revol@free.fr>.
+	  instead. Based on patch from Fran�is Revol <revol@free.fr>.
 	  Updated documentation accordingly. Fixed compilation warnings.
 	
 2005-08-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
diff --git a/backend/snapscan-options.c b/backend/snapscan-options.c
index 7f9e67253..5764fc3e6 100644
--- a/backend/snapscan-options.c
+++ b/backend/snapscan-options.c
@@ -233,7 +233,6 @@ static void init_options (SnapScan_Scanner * ps)
         {10, 50, 75, 100, 150, 200, 300, 400, 600, 1200, 2400};
     static SANE_Word resolutions_3200[] =
         {13, 200, 240, 266, 300, 350, 360, 400, 600, 720, 800, 1200, 2400, 3200};
-        //{17, 50, 72, 96, 150, 200, 240, 266, 300, 350, 360, 400, 600, 720, 800, 1200, 2400, 3200};
     static SANE_String_Const names_all[] =
         {md_colour, md_bilevelcolour, md_greyscale, md_lineart, NULL};
     static SANE_String_Const names_basic[] =
@@ -1535,6 +1534,9 @@ SANE_Status sane_control_option (SANE_Handle h,
 
 /*
  * $Log$
+ * Revision 1.23  2005/08/16 20:15:10  oliver-guest
+ * Removed C++-style comment
+ *
  * Revision 1.22  2005/08/15 18:06:37  oliver-guest
  * Added support for Epson 3490/3590 (thanks to Matt Judge)
  *