Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org