Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.