Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org