Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.