Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se