Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org