Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu