Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.org