lisp/ChangeLog: Merge from emacs-24; up to r117596 (Emacs trunk)