Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.