# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1283059372 -32400
# Node ID c6fd83f300a8a337c55c0485cb3bee4f93057d58
# Parent  c896870df40462c0699e60db2b63afb318339995# Parent  4ebf7a925b3595f3800c364011d71382d37df793
merge emacs-23

diff -r c896870df404 -r c6fd83f300a8 etc/ChangeLog
--- a/etc/ChangeLog	Sun Aug 29 14:15:34 2010 +0900
+++ b/etc/ChangeLog	Sun Aug 29 14:22:52 2010 +0900
@@ -1,4 +1,4 @@
-2010-08-22  Alex Harsanyi <harsanyi@mac.com>
+2010-08-22  Alex Harsanyi  <harsanyi@mac.com>  (tiny change)
 
 	* emacs3.py: Import imp module and use it (Bug#5756).