Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org