Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org