Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org