Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org