Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org