Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org