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