Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.org