Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de