Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 97-100)

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

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860

1 files changed, 27 insertions, 0 deletions

diff --git a/etc/README b/etc/README
index e18da7f381a..16e0923487d 100644
--- a/etc/README
+++ b/etc/README
@@ -10,8 +10,35 @@ for Emacs functions and variables.
 
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
+The files splash.xpm, splash8.xpm contain copyright and license
+information, but it is reproduced here for convenience.
+
+Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps
+  Author: Luis Fernandes <elf@ee.ryerson.ca>
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later (see COPYING)
+
 File: emacs.icon
   Author: Sun Microsystems, Inc
   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
+
+
+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 3, 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.