Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-619
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-620
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-621
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-622
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-623
   Remove RCS keywords

 * emacs@sv.gnu.org/emacs--devo--0--patch-624
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-625
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-626
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-627
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-628
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-629
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-630
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-631
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-632
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-633
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-634
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-635
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-636
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-637
   Remove RCS keywords

 * emacs@sv.gnu.org/emacs--devo--0--patch-638
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-639
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-640
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-641
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-642
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-643
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-644
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-645
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-646
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-647
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-648
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-649
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-197
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-198
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-199
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-200
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-201
   Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-202
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596

2 files changed, 21 insertions, 6 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index b8fc313228b..176197e6308 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1336,7 +1336,22 @@
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 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.
+
+  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.
 
 ;;; arch-tag: 0cd8ab87-d764-40d9-b86d-d00c71887a9e
diff --git a/lwlib/README b/lwlib/README
index cb0b6ebd371..427eea509e4 100644
--- a/lwlib/README
+++ b/lwlib/README
@@ -1,5 +1,5 @@
 This subdirectory contains the lwlib library which provides a uniform
-interface to a few different X toolkits.  The library was written by Lucid.
-This version has changes in the makefile to fit in with Emacs's configure
-script, and some source files have been renamed to fit in 14 characters.
-
+interface to a few different X toolkits.  The library was written by
+Lucid, and is not part of GNU Emacs.  This version has changes in the
+makefile to fit in with Emacs's configure script, and some source
+files have been renamed to fit in 14 characters.