[Erc-commit] [commit][master] Sync from emacs22

[mwolson]

commit 6156ecd95fd924680ae6dce71fdafb23f4818df6
Author: Michael W. Olson <address@hidden>
Date:   Wed Sep 19 07:12:44 2007 -0400

    Sync from emacs22

diff --git a/ChangeLog b/ChangeLog
index f2ea5f1..fec7357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-09-18  Exal de Jesus Garcia Carrillo  <address@hidden>
+2007-09-18  Exal de Jesus Garcia Carrillo  <address@hidden>  (tiny change)
 
        * erc.texi (Special-Features): Fix small typo.
 
@@ -7,7 +7,7 @@
        * erc-track.el (erc-track-switch-direction): Mention
        erc-track-faces-priority-list.  Thanks to Leo for the suggestion.
 
-2007-09-11  Exal de Jesus Garcia Carrillo  <address@hidden>
+2007-09-11  Exal de Jesus Garcia Carrillo  <address@hidden>  (tiny change)
 
        * erc-sound.el: Fix typo in setting up instructions.