Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com