Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org