Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org