Merge branch 'simplify-but-keep-xemacs-compatibility'
commita000f6163d7047e9f1e2d3ccfecadf745cefe2d8
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 18 Apr 2010 14:55:32 +0000 (18 16:55 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 18 Apr 2010 14:55:32 +0000 (18 16:55 +0200)
treec3655449070a2e902c64f1db735b9b633cd6c964
parent3672a495e19830f61bdff24d3a0b67a80cd7f9da
parentbb0ef787b77bec2ac7f8d2296acab98f6974cdc0
Merge branch 'simplify-but-keep-xemacs-compatibility'

Conflicts:
lisp/ChangeLog
lisp/ChangeLog