Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org