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

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/emacs-lisp/byte-run.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/help.el
Simple merge

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

diff --cc src/doc.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc test/Makefile.in
Simple merge