Merged from miles@gnu.org--gnu-2005 (patch 435-437)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
   Implement tty vertical-divider face

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

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

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

diff --cc etc/TODO
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/xfaces.c
Simple merge