--- a/src/ChangeLog	Fri Jan 29 15:06:36 2010 -0600
+++ b/src/ChangeLog	Fri Jan 29 20:59:21 2010 -0600
@@ -3,6 +3,14 @@
 	* Makefile.in.in: Remove internationalization rules, since the
 	lib-src programs they invoke are now gone.
 
+2010-01-29  Ben Wing  <ben@xemacs.org>
+
+	* search.c (boyer_moore): Fix longstanding bug involving
+	searching for Control-1 chars; code was trying to directly
+	extract the last byte in the textual representation of a char
+	from an Ichar (and doing it in a buggy fashion) rather than 
+	just converting the Ichar to text and looking at the last byte.
+
 2010-01-28  Ben Wing  <ben@xemacs.org>
 
 	* syswindows.h:
@@ -278,7 +286,6 @@
 	* number.c (vars_of_number):
 	most-positive-fixnum, most-negative-fixnum are no longer here.
 
->>>>>>> other
 2010-01-17  Vin Shelton  <acs@xemacs.org>
 
 	* fileio.c (check_writable): Remove cast from 2010-01-14