Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/find-func.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge