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/find-func.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge