Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.