Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

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

1 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f771639cb3d..387fcfc73f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * configure.in (HAVE_RES_INIT): Define if res_init() exists.
+        (HAVE_LIBRESOLV): Also define if we are using res_init().
+
+2007-10-17  Glenn Morris  <rgm@gnu.org>
+
+        * FTP: Remove file, since it's just a duplicate of one in etc/.
+
 2007-10-05  Eli Zaretskii  <eliz@gnu.org>
 
         * config.bat: Fix configuring `doc' due to changes in the