Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.