Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-619
   Update from CVS

 * [email protected]/emacs--devo--0--patch-620
   Update from CVS

 * [email protected]/emacs--devo--0--patch-621
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-622
   Update from CVS

 * [email protected]/emacs--devo--0--patch-623
   Remove RCS keywords

 * [email protected]/emacs--devo--0--patch-624
   Update from CVS

 * [email protected]/emacs--devo--0--patch-625
   Update from CVS

 * [email protected]/emacs--devo--0--patch-626
   Update from CVS

 * [email protected]/emacs--devo--0--patch-627
   Update from CVS

 * [email protected]/emacs--devo--0--patch-628
   Update from CVS

 * [email protected]/emacs--devo--0--patch-629
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-630
   Update from CVS

 * [email protected]/emacs--devo--0--patch-631
   Update from CVS

 * [email protected]/emacs--devo--0--patch-632
   Update from CVS

 * [email protected]/emacs--devo--0--patch-633
   Update from CVS

 * [email protected]/emacs--devo--0--patch-634
   Update from CVS

 * [email protected]/emacs--devo--0--patch-635
   Update from CVS

 * [email protected]/emacs--devo--0--patch-636
   Update from CVS

 * [email protected]/emacs--devo--0--patch-637
   Remove RCS keywords

 * [email protected]/emacs--devo--0--patch-638
   Update from CVS

 * [email protected]/emacs--devo--0--patch-639
   Update from CVS

 * [email protected]/emacs--devo--0--patch-640
   Update from CVS

 * [email protected]/emacs--devo--0--patch-641
   Update from CVS

 * [email protected]/emacs--devo--0--patch-642
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-643
   Update from CVS

 * [email protected]/emacs--devo--0--patch-644
   Update from CVS

 * [email protected]/emacs--devo--0--patch-645
   Update from CVS

 * [email protected]/emacs--devo--0--patch-646
   Update from CVS

 * [email protected]/emacs--devo--0--patch-647
   Update from CVS

 * [email protected]/emacs--devo--0--patch-648
   Update from CVS

 * [email protected]/emacs--devo--0--patch-649
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-197
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-198
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-199
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-200
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-201
   Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

 * [email protected]/gnus--rel--5.10--patch-202
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-596

1 files changed, 18 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index b20dc6646f..69794a18fa 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18858,9 +18858,24 @@
 See ChangeLog.1 for earlier changes.
 
     Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007
-    Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+      Free Software Foundation, Inc.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit