Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-717
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-718
   RCS keyword removal

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-719
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-272

diff --cc etc/TODO
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/config.in
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge