Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de