Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.