Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org