Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu