Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org