Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.