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

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/w32.c
Simple merge

diff --cc test/lisp/files-tests.el
Simple merge