Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org