Merge from emacs-24; up to 2012-12-19T13:01:16Z!michael.albinus@gmx.de