Merge from emacs--unicode--0

Patches applied:

 * emacs--devo--0  (patch 670-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * emacs--unicode--0  (patch 185-189)

   - Merge from emacs--devo--0
   - Update from CVS
   - vc-bzr.el: New file.

 * gnus--rel--5.10  (patch 209-215)

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

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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/ChangeLog.unicode
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge