Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com