Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org