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

diff --cc .gitignore
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/cus-dep.el
Simple merge

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

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

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

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge