Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.