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

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

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

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

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

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

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

diff --cc lisp/help.el
Simple merge

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

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

diff --cc lisp/subr.el
Simple merge