# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1288550296 -3600
# Node ID 7f0afd30f7645672d8b850e16e3b0ab4c9c7b4fe
# Parent  8da6c861bf9f509605edd588efde265d6ed3a284
More merge fixes.

diff -r 8da6c861bf9f -r 7f0afd30f764 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 31 11:26:54 2010 -0700
+++ b/lisp/ChangeLog	Sun Oct 31 19:38:16 2010 +0100
@@ -30,7 +30,7 @@
 
 2010-10-31  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
 
-	* add-log.el (find-change-log): Use derived-mode-p rather than
+	* vc/add-log.el (find-change-log): Use derived-mode-p rather than
 	major-mode (bug#7284).
 
 2010-10-31  Glenn Morris  <rgm@gnu.org>
diff -r 8da6c861bf9f -r 7f0afd30f764 lisp/cedet/ChangeLog
--- a/lisp/cedet/ChangeLog	Sun Oct 31 11:26:54 2010 -0700
+++ b/lisp/cedet/ChangeLog	Sun Oct 31 19:38:16 2010 +0100
@@ -6,12 +6,6 @@
 	(semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses
 	of toggle-read-only.
 
-2010-10-31  Juanma Barranquero  <lekktu@gmail.com>
-
-	* semantic/symref/list.el (semantic-symref-list-rename-open-hits):
-	Fix typo in message.
-	(semantic-symref-list-map-open-hits): Fix typo in docstring.
-
 2010-09-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* semantic/bovine/el.el: