Merge from emacs-24; up to 2012-12-24T06:24:08Z!eggert@cs.ucla.edu