Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca