Merged in changes from CVS trunk.
authorKaroly Lorentey <lorentey@elte.hu>
Mon, 7 Jun 2004 19:20:00 +0000 (19:20 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Mon, 7 Jun 2004 19:20:00 +0000 (19:20 +0000)
Patches applied:

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

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


Trivial merge