Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-17

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 85-96)

   - Update from CVS
   - Merge from erc--emacs--0
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 30-36)

   - Merge from emacs--devo--0
   - Update from CVS

diff --cc configure.in
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

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

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

diff --cc lisp/wid-edit.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge