merge changes in emacs-23 branch

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index dcb73156d7ee72ca84f643215f30c4442d99061b..70e002f0f9ef7411994f446a602f12954653d8cf 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -6,6 +6,10 @@
 
        * NEWS: dbus.el supports alternative buses.
 
+2010-08-22  Alex Harsanyi  <harsanyi@mac.com>  (tiny change)
+
+       * emacs3.py: Import imp module and use it (Bug#5756).
+
 2010-08-14  Eli Zaretskii  <eliz@gnu.org>
 
        * tutorials/TUTORIAL.he: Use MAQAF instead of hyphen where appropriate.