Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com