Merge from origin/emacs-24
The following commit was skipped:
a4ff05a
ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk.
This commit is contained in:
commit
7f55d42518