Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org