Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 839-842)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-29

diff --cc lisp/menu-bar.el
Simple merge

diff --cc src/gtkutil.c
Simple merge