diff --git a/lib/master.pike.in b/lib/master.pike.in
index 93d5ccd8c23989ae581e918b0a481e877915e8f1..f94622599392181441a38585f103c4c2d3a57f31 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -3,10 +3,10 @@
 // Master Control Program for Pike.
 //
 // This file is part of Pike. For copyright information see COPYRIGHT.
-// Pike is distributed as GPL (General Public License)
-// See the files COPYING and DISCLAIMER for more information.
+// Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+// for more information.
 //
-// $Id: master.pike.in,v 1.204 2002/05/24 21:46:03 nilsson Exp $
+// $Id: master.pike.in,v 1.205 2002/05/31 22:25:15 nilsson Exp $
 
 #pike __REAL_VERSION__
 
diff --git a/src/alloca.c b/src/alloca.c
index e4d333fd1b63b96ca6a679431d5d36adbfda7340..9a8c3690e8e9eb739b0a9b702fc21f655e5f5073 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: alloca.c,v 1.4 2002/01/16 02:54:07 nilsson Exp $
+ * $Id: alloca.c,v 1.5 2002/05/31 22:41:19 nilsson Exp $
  */
 #include <stdio.h>
 /*
diff --git a/src/array.c b/src/array.c
index 2745f9c685791b282986237cd124a68bcf210bfa..88b73bff0e1a57ce7bb35eea0b2f159742a0cb72 100644
--- a/src/array.c
+++ b/src/array.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -24,7 +24,7 @@
 #include "bignum.h"
 #include "cyclic.h"
 
-RCSID("$Id: array.c,v 1.127 2002/05/28 15:37:17 grubba Exp $");
+RCSID("$Id: array.c,v 1.128 2002/05/31 22:41:19 nilsson Exp $");
 
 PMOD_EXPORT struct array empty_array=
 {
diff --git a/src/array.h b/src/array.h
index d8cd29c5f2fac2c78d871af7c35cb45df8fe43c2..cd750c4c758de57084187754f18bdd853ace2eed 100644
--- a/src/array.h
+++ b/src/array.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: array.h,v 1.39 2002/01/16 02:54:07 nilsson Exp $
+ * $Id: array.h,v 1.40 2002/05/31 22:41:22 nilsson Exp $
  */
 #ifndef ARRAY_H
 #define ARRAY_H
diff --git a/src/backend.cmod b/src/backend.cmod
index 556704ea4170abf6c94fc879ec09b48a14e93ee9..6f557a39399303ccc17ed976bb60291bf440e362 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -1,11 +1,11 @@
 /*\ -*- c -*-
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: backend.cmod,v 1.25 2002/05/24 14:18:41 grubba Exp $");
+RCSID("$Id: backend.cmod,v 1.26 2002/05/31 22:41:23 nilsson Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include <errno.h>
diff --git a/src/backend.h b/src/backend.h
index 3f0cd9831f3cb83bd966640c79ee6069bb04e9ed..5023b2c0c0adbc57f0a696f200d1717ee6dec7ac 100644
--- a/src/backend.h
+++ b/src/backend.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: backend.h,v 1.13 2002/01/16 02:54:08 nilsson Exp $
+ * $Id: backend.h,v 1.14 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef BACKEND_H
 #define BACKEND_H
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 4fa6739908892c8446c4e2c96e716299d8a6d2b9..e8bbeb5458f9b9bc6d6b4c15fc0bf4fea31d7fbd 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.430 2002/05/14 16:27:49 grubba Exp $");
+RCSID("$Id: builtin_functions.c,v 1.431 2002/05/31 22:41:23 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
diff --git a/src/builtin_functions.h b/src/builtin_functions.h
index 1542c7710f68a6c951952a9769b24579957f4abc..c8dc4c1574ce36527ff04cac8b4ee83139c77465 100644
--- a/src/builtin_functions.h
+++ b/src/builtin_functions.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: builtin_functions.h,v 1.19 2002/01/16 02:54:09 nilsson Exp $
+ * $Id: builtin_functions.h,v 1.20 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef BUILTIN_EFUNS_H
 #define BUILTIN_EFUNS_H
diff --git a/src/callback.c b/src/callback.c
index f65b61069432187f88bb358ca69b4f979d3479ff..c5654ed9a8bb76796471e11404e962d35bfdf565 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -10,7 +10,7 @@
 #include "pike_error.h"
 #include "block_alloc.h"
 
-RCSID("$Id: callback.c,v 1.24 2002/01/16 02:54:09 nilsson Exp $");
+RCSID("$Id: callback.c,v 1.25 2002/05/31 22:41:23 nilsson Exp $");
 
 struct callback_list fork_child_callback;
 
diff --git a/src/callback.h b/src/callback.h
index c769b8dcafe92f287abf290c7dbd8ca2a3b860f5..f38e106b8e9a1fcc0c09394ae49d84101d46e111 100644
--- a/src/callback.h
+++ b/src/callback.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: callback.h,v 1.15 2002/01/16 02:54:09 nilsson Exp $
+ * $Id: callback.h,v 1.16 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef CALLBACK_H
 #define CALLBACK_H
diff --git a/src/constants.c b/src/constants.c
index f1d681df93cb5c68885bf3514ad591031db211eb..fa38035bc6e2adb4400d92a7a4490abece12fd87 100644
--- a/src/constants.c
+++ b/src/constants.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -17,7 +17,7 @@
 #include "security.h"
 #include "block_alloc.h"
 
-RCSID("$Id: constants.c,v 1.35 2002/01/27 18:25:43 mast Exp $");
+RCSID("$Id: constants.c,v 1.36 2002/05/31 22:41:23 nilsson Exp $");
 
 struct mapping *builtin_constants = 0;
 
diff --git a/src/constants.h b/src/constants.h
index e75b817dcafbed46dc229b7832d583d651a02e0a..65b5eb077b39c5d24f92c0624656592a88d9ffec 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: constants.h,v 1.21 2002/01/27 18:25:43 mast Exp $
+ * $Id: constants.h,v 1.22 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef ADD_EFUN_H
 #define ADD_EFUN_H
diff --git a/src/cpp.c b/src/cpp.c
index 4d5b60a4813f948aeed70988c80fbe910b64b175..a3d14bebdf04cc94e5f022313e1d17b4cc418279 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: cpp.c,v 1.100 2002/05/11 00:29:57 nilsson Exp $
+ * $Id: cpp.c,v 1.101 2002/05/31 22:41:23 nilsson Exp $
  */
 #include "global.h"
 #include "stralloc.h"
diff --git a/src/dlopen.c b/src/dlopen.c
index a9e6d9967589a860785af10005f5b8123c49b26d..572125ee50247d5b8aa420c2d3f993b76f6767f7 100644
--- a/src/dlopen.c
+++ b/src/dlopen.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
@@ -185,7 +185,7 @@ size_t STRNLEN(char *s, size_t maxlen)
 
 #else /* PIKE_CONCAT */
 
-RCSID("$Id: dlopen.c,v 1.30 2002/02/11 01:55:50 marcus Exp $");
+RCSID("$Id: dlopen.c,v 1.31 2002/05/31 22:41:23 nilsson Exp $");
 
 #endif
 
diff --git a/src/docode.c b/src/docode.c
index 8b64e46db54ffb731066b0c7f7f9f5366279131b..e692afd9abf669f2ba3a85ba4dc27451853369e3 100644
--- a/src/docode.c
+++ b/src/docode.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: docode.c,v 1.141 2002/04/07 19:34:53 marcus Exp $");
+RCSID("$Id: docode.c,v 1.142 2002/05/31 22:41:23 nilsson Exp $");
 #include "las.h"
 #include "program.h"
 #include "pike_types.h"
diff --git a/src/docode.h b/src/docode.h
index c5ae0390b3f86f7b762cda47babd2b6429e54429..c6520bbf1cf6d7c121a4a92f12a9f2a81ead6ee1 100644
--- a/src/docode.h
+++ b/src/docode.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: docode.h,v 1.14 2002/01/16 02:54:10 nilsson Exp $
+ * $Id: docode.h,v 1.15 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef DOCODE_H
 #define DOCODE_H
diff --git a/src/dynamic_buffer.c b/src/dynamic_buffer.c
index ed139c153877f66869d2d2607ff8885c0f5e3531..b4a4a330eea454820400c3c265f32b381c9c1947 100644
--- a/src/dynamic_buffer.c
+++ b/src/dynamic_buffer.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -10,7 +10,7 @@
 #include "pike_error.h"
 #include "pike_memory.h"
 
-RCSID("$Id: dynamic_buffer.c,v 1.14 2002/01/16 02:54:10 nilsson Exp $");
+RCSID("$Id: dynamic_buffer.c,v 1.15 2002/05/31 22:41:23 nilsson Exp $");
 
 static dynamic_buffer buff;
 
diff --git a/src/dynamic_buffer.h b/src/dynamic_buffer.h
index e99a750d8030d0511eff122873326236fa42f659..d2f7857032722a179d10bd73a8f9da023a1c6a37 100644
--- a/src/dynamic_buffer.h
+++ b/src/dynamic_buffer.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: dynamic_buffer.h,v 1.12 2002/01/16 02:54:10 nilsson Exp $
+ * $Id: dynamic_buffer.h,v 1.13 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef DYNAMIC_BUFFER_H
 #define DYNAMIC_BUFFER_H
diff --git a/src/efun.h b/src/efun.h
index eca01e99104c87cf28111928c1883c3d245b12f7..aa2dd45a9fbc8718a760f058f598eac51f55f2ce 100644
--- a/src/efun.h
+++ b/src/efun.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: efun.h,v 1.4 2002/01/16 02:54:10 nilsson Exp $
+ * $Id: efun.h,v 1.5 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef EFUN_H
 #define EFUN_H
diff --git a/src/encode.c b/src/encode.c
index f14b7eedbe6cb0c5f2741803c1d88b69430cb5c1..7440f47f8f271677b386e4163b660b50c0ebff79 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -26,7 +26,7 @@
 #include "bignum.h"
 #include "pikecode.h"
 
-RCSID("$Id: encode.c,v 1.146 2002/05/14 12:13:12 grubba Exp $");
+RCSID("$Id: encode.c,v 1.147 2002/05/31 22:41:23 nilsson Exp $");
 
 /* #define ENCODE_DEBUG */
 
diff --git a/src/encode.h b/src/encode.h
index 06c3187d14199b5ae994b3a6d23fb20528d409fe..187f23afdd6cd7dd2fc7a5ea4b54640a71e7e91b 100644
--- a/src/encode.h
+++ b/src/encode.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: encode.h,v 1.4 2002/01/16 02:54:11 nilsson Exp $
+ * $Id: encode.h,v 1.5 2002/05/31 22:41:23 nilsson Exp $
  */
 #ifndef ENCODE_H
 #define ENCODE_H
diff --git a/src/error.c b/src/error.c
index 4665831216f48c74ed73e652ca8b339a92c3fba3..aed10d9e1cc396bff565a33e0fab6f284239de63 100644
--- a/src/error.c
+++ b/src/error.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #define NO_PIKE_SHORTHAND
@@ -22,7 +22,7 @@
 #include "threads.h"
 #include "gc.h"
 
-RCSID("$Id: error.c,v 1.84 2002/03/26 19:38:26 mast Exp $");
+RCSID("$Id: error.c,v 1.85 2002/05/31 22:41:23 nilsson Exp $");
 
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
diff --git a/src/fd_control.c b/src/fd_control.c
index 722a7cabb0b859e8e0ce2edef116f526e4f003a6..bee45e8bca6ec37c3b8d92019ef2e7707471ae9c 100644
--- a/src/fd_control.c
+++ b/src/fd_control.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
@@ -10,7 +10,7 @@
 #include "pike_error.h"
 #include "fdlib.h"
 
-RCSID("$Id: fd_control.c,v 1.39 2002/01/27 01:00:53 mast Exp $");
+RCSID("$Id: fd_control.c,v 1.40 2002/05/31 22:41:23 nilsson Exp $");
 
 #else /* TESTING */
 
diff --git a/src/fd_control.h b/src/fd_control.h
index 982dd09ff9d312242cd078d16166b9ce9dd6740d..e6eac33204a0d8727face18b3b8af1eaf0905f83 100644
--- a/src/fd_control.h
+++ b/src/fd_control.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: fd_control.h,v 1.7 2002/01/16 02:54:12 nilsson Exp $
+ * $Id: fd_control.h,v 1.8 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef FD_CONTROL_H
 #define FD_CONTROL_H
diff --git a/src/fsort.c b/src/fsort.c
index c0ceea723675e3d4ccef330aaf25fece70ac4910..71299c6b785e483b77e2801e95926b01b2dda085 100644
--- a/src/fsort.c
+++ b/src/fsort.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /* fsort- a smarter quicksort /Hubbe */
 /* Optimized for minimum amount of compares */
@@ -11,7 +11,7 @@
 #include "fsort.h"
 #include "main.h"
 
-RCSID("$Id: fsort.c,v 1.16 2002/01/16 02:54:12 nilsson Exp $");
+RCSID("$Id: fsort.c,v 1.17 2002/05/31 22:41:24 nilsson Exp $");
 
 #define CMP(X,Y) ( (*cmpfun)((void *)(X),(void *)(Y)) )
 #define EXTRA_ARGS ,fsortfun cmpfun
diff --git a/src/fsort.h b/src/fsort.h
index 8d4f03ac55feb7c79adf6c70cb6c97c1a3f44f06..df56c375fdee700e164b4f1fb570e3a48da6e26f 100644
--- a/src/fsort.h
+++ b/src/fsort.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: fsort.h,v 1.3 2002/01/16 02:54:12 nilsson Exp $
+ * $Id: fsort.h,v 1.4 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef FSORT_H
 #define FSORT_H
diff --git a/src/gc.c b/src/gc.c
index faaa335f83f69e1499139d886993068717d97310..05b0ad32ae4af4a42b14109329a52a19076bacff 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -30,7 +30,7 @@ struct callback *gc_evaluator_callback=0;
 
 #include "block_alloc.h"
 
-RCSID("$Id: gc.c,v 1.182 2002/05/15 09:06:54 grubba Exp $");
+RCSID("$Id: gc.c,v 1.183 2002/05/31 22:41:24 nilsson Exp $");
 
 /* Run garbage collect approximately every time
  * 20 percent of all arrays, objects and programs is
diff --git a/src/global.h b/src/global.h
index 5bf50a749ab7b4f4768ba138c057360a6acc7ca3..cbe6000ca2e5a22c2bca469f4e8b8d9ee2fef517 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: global.h,v 1.68 2002/04/11 22:08:49 mast Exp $
+ * $Id: global.h,v 1.69 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef GLOBAL_H
 #define GLOBAL_H
diff --git a/src/hashtable.c b/src/hashtable.c
index 2f88f6f75ff23e399e776fc0d1ec7c0d4b2af764..5e8ba8f3845cfa514c286b731001e382e419d132 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -10,7 +10,7 @@
 #include "stuff.h"
 #include "pike_error.h"
 
-RCSID("$Id: hashtable.c,v 1.9 2002/01/16 02:54:12 nilsson Exp $");
+RCSID("$Id: hashtable.c,v 1.10 2002/05/31 22:41:24 nilsson Exp $");
 
 static size_t gobble(struct pike_string *s)
 {
diff --git a/src/hashtable.h b/src/hashtable.h
index f7029e03746244ac9dc00f419e7d44add9edd790..768225aac6ae8a7c435e296a2fdd21060528070e 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: hashtable.h,v 1.6 2002/01/16 02:54:13 nilsson Exp $
+ * $Id: hashtable.h,v 1.7 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef HASHTABLE_H
 #define HASHTABLE_H
diff --git a/src/interpret.c b/src/interpret.c
index 8c90650bd5d6c9e37f61bca51a2497016404f540..01e7a2a034f2bbde2c45fd213b7da4515d47eb65 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: interpret.c,v 1.260 2002/05/15 09:11:21 grubba Exp $");
+RCSID("$Id: interpret.c,v 1.261 2002/05/31 22:41:24 nilsson Exp $");
 #include "interpret.h"
 #include "object.h"
 #include "program.h"
diff --git a/src/interpret.h b/src/interpret.h
index cd76e24573da733e7552bf09b56fba4962b26fa2..3b6fe70c16deaefc15170073aebad0616be1373c 100644
--- a/src/interpret.h
+++ b/src/interpret.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: interpret.h,v 1.108 2002/05/11 00:05:28 nilsson Exp $
+ * $Id: interpret.h,v 1.109 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef INTERPRET_H
 #define INTERPRET_H
diff --git a/src/iterators.cmod b/src/iterators.cmod
index 6e790c1a441c682182f8d34887166606d4d42c78..5b3f1455f43c60a58d242955dd5afc272466b64a 100644
--- a/src/iterators.cmod
+++ b/src/iterators.cmod
@@ -1,11 +1,11 @@
 /*\ -*- c -*-
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: iterators.cmod,v 1.19 2002/05/11 00:29:57 nilsson Exp $");
+RCSID("$Id: iterators.cmod,v 1.20 2002/05/31 22:41:24 nilsson Exp $");
 #include "main.h"
 #include "object.h"
 #include "mapping.h"
diff --git a/src/language.yacc b/src/language.yacc
index 302a2cdd63dc71a38de5addc6fe95c0403a8c00d..07eb3d11225fbfbebd20da0560fa61998093f6a8 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -1,8 +1,8 @@
 /* -*- C -*- */
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 %pure_parser
@@ -113,7 +113,7 @@
 /* This is the grammar definition of Pike. */
 
 #include "global.h"
-RCSID("$Id: language.yacc,v 1.284 2002/05/12 01:24:19 mast Exp $");
+RCSID("$Id: language.yacc,v 1.285 2002/05/31 22:41:24 nilsson Exp $");
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif
diff --git a/src/las.c b/src/las.c
index 1588633c1be2c0825192d6823c0fcd3cac9c6f2b..15298f18016a8ed79387f761c509f992ba0c5d27 100644
--- a/src/las.c
+++ b/src/las.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: las.c,v 1.290 2002/05/23 14:40:24 grubba Exp $");
+RCSID("$Id: las.c,v 1.291 2002/05/31 22:41:24 nilsson Exp $");
 
 #include "language.h"
 #include "interpret.h"
diff --git a/src/las.h b/src/las.h
index 76442080f4814e35795a4f4042de99313722ba4f..c12ab4c78651e3c17344e64816cd092a6984af64 100644
--- a/src/las.h
+++ b/src/las.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: las.h,v 1.55 2002/01/16 02:54:14 nilsson Exp $
+ * $Id: las.h,v 1.56 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef LAS_H
 #define LAS_H
diff --git a/src/lex.c b/src/lex.c
index 5dfe25d265e5c11c600d84b60c1b02657c71c875..23b05b0ba67195a4925eceeb562e1acac0d28671 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: lex.c,v 1.103 2002/05/10 22:28:28 mast Exp $");
+RCSID("$Id: lex.c,v 1.104 2002/05/31 22:41:24 nilsson Exp $");
 #include "language.h"
 #include "array.h"
 #include "lex.h"
diff --git a/src/lex.h b/src/lex.h
index d1bf00723f6bdeb200cd66dcceea8b21dc8d5eda..5e48cdc16f9b1a916706411ac24acb5734a2dd9f 100644
--- a/src/lex.h
+++ b/src/lex.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: lex.h,v 1.21 2002/05/10 22:28:28 mast Exp $
+ * $Id: lex.h,v 1.22 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef LEX_H
 #define LEX_H
diff --git a/src/main.c b/src/main.c
index 18a346861fa6329f3090c8f0c7cdb015375c5772..51a961254d046733380338a3ffe7c4e785ca79ae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: main.c,v 1.147 2002/05/13 22:14:05 mast Exp $");
+RCSID("$Id: main.c,v 1.148 2002/05/31 22:41:24 nilsson Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include "module.h"
diff --git a/src/main.h b/src/main.h
index 2e5997c4f4594186c28e94471ef3db628baaf53a..747cdd4402972160e81ad43b9b73aa8b2ffc2f04 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: main.h,v 1.17 2002/01/16 02:54:14 nilsson Exp $
+ * $Id: main.h,v 1.18 2002/05/31 22:41:24 nilsson Exp $
  */
 #ifndef MAIN_H
 #define MAIN_H
diff --git a/src/mapping.c b/src/mapping.c
index 5699d19ca7c7e536702bf8113e4acca0ac905382..e5ecfe28ff66fa39a7e42e088f5d8ff132718323 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: mapping.c,v 1.147 2002/05/10 23:52:34 nilsson Exp $");
+RCSID("$Id: mapping.c,v 1.148 2002/05/31 22:41:24 nilsson Exp $");
 #include "main.h"
 #include "object.h"
 #include "mapping.h"
diff --git a/src/mapping.h b/src/mapping.h
index 40077e2edd7857422db903f23f938702a5f8c7cd..a6b5ef9183f831b5760ca5f04a94fa17fb9418a0 100644
--- a/src/mapping.h
+++ b/src/mapping.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: mapping.h,v 1.41 2002/01/16 02:54:15 nilsson Exp $
+ * $Id: mapping.h,v 1.42 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef MAPPING_H
 #define MAPPING_H
diff --git a/src/module.c b/src/module.c
index acff36148ad360b93bdf9c437f28ab76c2e4cb8f..7ecc431edf1a96657f78250201292225d1cb0ef3 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -24,7 +24,7 @@
 #include "post_modules/modlist_headers.h"
 #endif
 
-RCSID("$Id: module.c,v 1.16 2002/01/31 17:52:15 marcus Exp $");
+RCSID("$Id: module.c,v 1.17 2002/05/31 22:41:25 nilsson Exp $");
 
 typedef void (*modfun)(void);
 
diff --git a/src/module.h b/src/module.h
index 1f5a35208747703124d1cbbad2672d64107be59f..3d09c090db6c85905a9dd24fd1534c2266448768 100644
--- a/src/module.h
+++ b/src/module.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: module.h,v 1.5 2002/01/16 02:54:15 nilsson Exp $
+ * $Id: module.h,v 1.6 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef MODULE_H
 #define MODULE_H
diff --git a/src/module_support.h b/src/module_support.h
index 9113758af7f62bff286aa5dc2dbe1117a117ccd1..8732a79d4c24efb463e8baca47c03a0b06b9b49f 100644
--- a/src/module_support.h
+++ b/src/module_support.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: module_support.h,v 1.10 2002/05/13 22:14:04 mast Exp $
+ * $Id: module_support.h,v 1.11 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef MODULE_SUPPORT_H
 #include <stdarg.h>
diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index 51e9b797fc6e5378603292d4824e9397a4445f85..de521a65d4c83e406dac8b3d0c2e1e82c5de9360 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -1,10 +1,10 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.17 2002/05/11 00:27:02 nilsson Exp $");
+RCSID("$Id: gdbmmod.c,v 1.18 2002/05/31 22:31:39 nilsson Exp $");
 #include "gdbm_machine.h"
 #include "threads.h"
 
diff --git a/src/modules/Gmp/mpf.cmod b/src/modules/Gmp/mpf.cmod
index 60d427e628f8bfe5a3613225c4f3f2cb59f904f3..13390a7e7de5700a6c74def7f748f95f624b710f 100644
--- a/src/modules/Gmp/mpf.cmod
+++ b/src/modules/Gmp/mpf.cmod
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: mpf.cmod,v 1.5 2002/05/11 00:13:10 nilsson Exp $");
+RCSID("$Id: mpf.cmod,v 1.6 2002/05/31 22:31:39 nilsson Exp $");
 #include "gmp_machine.h"
 
 #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2)
diff --git a/src/modules/Gmp/mpq.cmod b/src/modules/Gmp/mpq.cmod
index 273660a9c6c267d5a1aa03add3ebbae849772c1e..fa72ddd07f2b00eca2cab2f40b04a9e05c7e53c9 100644
--- a/src/modules/Gmp/mpq.cmod
+++ b/src/modules/Gmp/mpq.cmod
@@ -1,10 +1,10 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpq.cmod,v 1.6 2002/05/11 00:13:10 nilsson Exp $");
+RCSID("$Id: mpq.cmod,v 1.7 2002/05/31 22:31:39 nilsson Exp $");
 #include "gmp_machine.h"
 
 #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2)
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index 8d809a886a52da742fdbfd06b121cbafa40ccbba..3552bf74860571d5c555757176ec02193f4cbcc9 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.104 2002/05/11 00:13:10 nilsson Exp $");
+RCSID("$Id: mpz_glue.c,v 1.105 2002/05/31 22:31:39 nilsson Exp $");
 #include "gmp_machine.h"
 
 #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2)
diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 416fcf0861136c9f7da0389643a32e8a9c66b523..07aff4b37dd56a0dc9afdc2b033e1600825e9034 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: zlibmod.c,v 1.45 2002/05/11 01:32:43 mast Exp $");
+RCSID("$Id: zlibmod.c,v 1.46 2002/05/31 22:31:40 nilsson Exp $");
 
 #include "zlib_machine.h"
 
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index dd31a13a410ed0b0a5b88bd660b37605eeb0709e..bb773add1e5ccae45ccdd11623ca1e035570ae3d 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
@@ -21,7 +21,7 @@
 #include "module_support.h"
 #include "builtin_functions.h"
 
-RCSID("$Id: glue.c,v 1.26 2002/05/11 00:27:03 nilsson Exp $");
+RCSID("$Id: glue.c,v 1.27 2002/05/31 22:31:40 nilsson Exp $");
 
 #ifdef USE_SYSTEM_REGEXP
 #include <regexp.h>
diff --git a/src/modules/Regexp/pike_regexp.h b/src/modules/Regexp/pike_regexp.h
index edd0b0f24aa838259e128d679afe748a4f0e625d..ba7f0b9c6021c068714db9d4262814d1ef88469a 100644
--- a/src/modules/Regexp/pike_regexp.h
+++ b/src/modules/Regexp/pike_regexp.h
@@ -1,13 +1,13 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #ifndef REGEXP_H
 #define REGEXP_H
 /*
- * $Id: pike_regexp.h,v 1.5 2002/01/16 03:02:34 nilsson Exp $
+ * $Id: pike_regexp.h,v 1.6 2002/05/31 22:31:40 nilsson Exp $
  *
  * Definitions etc. for regexp(3) routines.
  *
diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c
index 1e5544b9dff83373ab1ff3bb98a4e923a8015dfd..6f4c0af8d631ef71d9f8c06c9e9903f0e76dbc9e 100644
--- a/src/modules/Ssleay/ssleay.c
+++ b/src/modules/Ssleay/ssleay.c
@@ -1,14 +1,14 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 #include "global.h"
 
 #include "config.h"
 
-RCSID("$Id: ssleay.c,v 1.16 2002/05/11 00:24:25 nilsson Exp $");
+RCSID("$Id: ssleay.c,v 1.17 2002/05/31 22:31:40 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/_math/math.c b/src/modules/_math/math.c
index 1b600068f1925fe925d96c448cc87b2bafd46be6..98a10b830357da7772571e8533b6854845f9edfc 100644
--- a/src/modules/_math/math.c
+++ b/src/modules/_math/math.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -27,7 +27,7 @@
 
 #define sp Pike_sp
 
-RCSID("$Id: math.c,v 1.45 2002/05/11 00:44:12 nilsson Exp $");
+RCSID("$Id: math.c,v 1.46 2002/05/31 22:31:40 nilsson Exp $");
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795080
diff --git a/src/modules/files/datagram.c b/src/modules/files/datagram.c
index 2c565e631cc9510dcb8021f89df3f7b081ddceb5..474f161594a467642e2d291da9a0bd75ec24a43c 100644
--- a/src/modules/files/datagram.c
+++ b/src/modules/files/datagram.c
@@ -1,13 +1,13 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
 #include "global.h"
 
-RCSID("$Id: datagram.c,v 1.4 2002/01/16 02:57:28 nilsson Exp $");
+RCSID("$Id: datagram.c,v 1.5 2002/05/31 22:31:40 nilsson Exp $");
 
 struct datagram
 {
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index 8d88030b52116adca12a11aa307ad23329df1aa3..3907233d4c6d0d8388d433fe0014859dc4a7bcde 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -25,7 +25,7 @@
 #include "file_machine.h"
 #include "file.h"
 
-RCSID("$Id: efuns.c,v 1.112 2002/05/11 00:27:04 nilsson Exp $");
+RCSID("$Id: efuns.c,v 1.113 2002/05/31 22:31:40 nilsson Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index c38666bb00579d28b4f42319262c9f8ce04d3603..c047d83707c526d806262a3ac4305263ec9048b9 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -1,12 +1,12 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #define NO_PIKE_SHORTHAND
 #include "global.h"
-RCSID("$Id: file.c,v 1.234 2002/05/19 15:13:33 per Exp $");
+RCSID("$Id: file.c,v 1.235 2002/05/31 22:31:40 nilsson Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
diff --git a/src/modules/files/file.h b/src/modules/files/file.h
index 22ecd6a5087751f54d48537f8391277f68d0daa1..d13978ce1fc2207f7732f9b5282f39663d12b812 100644
--- a/src/modules/files/file.h
+++ b/src/modules/files/file.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: file.h,v 1.20 2002/01/16 02:57:29 nilsson Exp $
+ * $Id: file.h,v 1.21 2002/05/31 22:31:40 nilsson Exp $
  */
 
 #ifndef FILE_H
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index 7742238f6dc3f4ac535945a9f8866e67d178e4da..b815abd174da774d34a5c668348a7c92764d274b 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #define NO_PIKE_SHORTHAND
@@ -22,7 +22,7 @@
 #include "file_machine.h"
 #include "file.h"
 
-RCSID("$Id: socket.c,v 1.61 2002/04/01 13:26:46 nilsson Exp $");
+RCSID("$Id: socket.c,v 1.62 2002/05/31 22:31:40 nilsson Exp $");
 
 #ifdef HAVE_SYS_TYPE_H
 #include <sys/types.h>
diff --git a/src/modules/sprintf/sprintf.c b/src/modules/sprintf/sprintf.c
index e651314d31386ac2a9d3c17ebf42b06685ab596d..4fe8908afbe1875691ba39e1b3847bd968c37f3e 100644
--- a/src/modules/sprintf/sprintf.c
+++ b/src/modules/sprintf/sprintf.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /* TODO: use ONERROR to cleanup fsp */
@@ -281,7 +281,7 @@
  *!   @[lfun::_sprintf()]
  */
 #include "global.h"
-RCSID("$Id: sprintf.c,v 1.91 2002/05/11 00:43:49 nilsson Exp $");
+RCSID("$Id: sprintf.c,v 1.92 2002/05/31 22:31:40 nilsson Exp $");
 #include "pike_error.h"
 #include "array.h"
 #include "svalue.h"
diff --git a/src/multiset.c b/src/multiset.c
index 51b573d29e35eb782e1d3b898488d62f3e05bafc..2539d458e1661276e76b64d228bef1be4e976478 100644
--- a/src/multiset.c
+++ b/src/multiset.c
@@ -7,7 +7,7 @@
  * Created by Martin Stjernholm 2001-05-07
  */
 
-RCSID("$Id: multiset.c,v 1.48 2002/05/11 01:36:00 mast Exp $");
+RCSID("$Id: multiset.c,v 1.49 2002/05/31 22:41:25 nilsson Exp $");
 
 #include "builtin_functions.h"
 #include "gc.h"
@@ -5194,8 +5194,8 @@ void test_multiset (void)
 
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
@@ -5212,7 +5212,7 @@ void test_multiset (void)
 #include "gc.h"
 #include "security.h"
 
-RCSID("$Id: multiset.c,v 1.48 2002/05/11 01:36:00 mast Exp $");
+RCSID("$Id: multiset.c,v 1.49 2002/05/31 22:41:25 nilsson Exp $");
 
 struct multiset *first_multiset;
 
diff --git a/src/multiset.h b/src/multiset.h
index e26e990b25dbf2e6cd80450d8428ad0be44b0855..42971192d2e7faacc734a93cb9cfe7363e24c890 100644
--- a/src/multiset.h
+++ b/src/multiset.h
@@ -7,7 +7,7 @@
  *
  * Created by Martin Stjernholm 2001-05-07
  *
- * $Id: multiset.h,v 1.23 2002/01/16 02:54:15 nilsson Exp $
+ * $Id: multiset.h,v 1.24 2002/05/31 22:41:25 nilsson Exp $
  */
 
 /* #define TEST_MULTISET */
@@ -434,12 +434,12 @@ void test_multiset (void);
 
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: multiset.h,v 1.23 2002/01/16 02:54:15 nilsson Exp $
+ * $Id: multiset.h,v 1.24 2002/05/31 22:41:25 nilsson Exp $
  */
 
 #include "las.h"
diff --git a/src/object.c b/src/object.c
index 98af4af3791e02cd974cd546e0af520f8cf35f1a..c2fdab5c245a63152c4af0749d2bd2f52ac8390f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: object.c,v 1.200 2002/05/11 00:29:57 nilsson Exp $");
+RCSID("$Id: object.c,v 1.201 2002/05/31 22:41:25 nilsson Exp $");
 #include "object.h"
 #include "dynamic_buffer.h"
 #include "interpret.h"
diff --git a/src/object.h b/src/object.h
index 597cfef4ec76c7d7d3ab9f9e1f73976a715173d5..b02f85dcd1d820eab88df97a73db526c3a6ceb64 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: object.h,v 1.69 2002/01/16 02:54:16 nilsson Exp $
+ * $Id: object.h,v 1.70 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef OBJECT_H
 #define OBJECT_H
diff --git a/src/opcodes.c b/src/opcodes.c
index 38796175c63918bed8d2bf30444d15768e08b8a2..9f62a3e33ad08be235815a5af4dbd481e51b3cd0 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -29,7 +29,7 @@
 
 #define sp Pike_sp
 
-RCSID("$Id: opcodes.c,v 1.120 2002/05/11 00:29:58 nilsson Exp $");
+RCSID("$Id: opcodes.c,v 1.121 2002/05/31 22:41:25 nilsson Exp $");
 
 void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind)
 {
diff --git a/src/opcodes.h b/src/opcodes.h
index 8c1450770274d903478686efeaab5d818fc6aae5..0ccae85dc6b407261407048b1798ffbc0badd44b 100644
--- a/src/opcodes.h
+++ b/src/opcodes.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: opcodes.h,v 1.27 2002/05/10 22:28:28 mast Exp $
+ * $Id: opcodes.h,v 1.28 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef OPCODES_H
 #define OPCODES_H
diff --git a/src/operators.c b/src/operators.c
index c76a90022649b3e2591dbf5f03590dfb59b05226..d6ffe32f644e432644a092308a07b0ff71b3ec90 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -1,12 +1,12 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
 #include <math.h>
-RCSID("$Id: operators.c,v 1.152 2002/05/31 13:44:31 nilsson Exp $");
+RCSID("$Id: operators.c,v 1.153 2002/05/31 22:41:25 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"
diff --git a/src/operators.h b/src/operators.h
index 5da06af61db5fcba385d4bb54aedc016f1f90063..e30807468f712dcd061788c9d47853d224a439da 100644
--- a/src/operators.h
+++ b/src/operators.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: operators.h,v 1.10 2002/01/16 02:54:17 nilsson Exp $
+ * $Id: operators.h,v 1.11 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef OPERATORS_H
 #define OPERATORS_H
diff --git a/src/pike_error.h b/src/pike_error.h
index 0e1dde7437874a22819573b7a5471aa73779e400..0d7983aca795eeed9d26fa892fee9107f2d5e495 100644
--- a/src/pike_error.h
+++ b/src/pike_error.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: pike_error.h,v 1.17 2002/01/16 02:54:17 nilsson Exp $
+ * $Id: pike_error.h,v 1.18 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef PIKE_ERROR_H
 #define PIKE_ERROR_H
diff --git a/src/pike_macros.h b/src/pike_macros.h
index b843c3032bd0ebeac441eff0436c512667083ddb..2551be367a676068a534733e1d098fe2cb9cb85d 100644
--- a/src/pike_macros.h
+++ b/src/pike_macros.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: pike_macros.h,v 1.29 2002/01/16 02:54:17 nilsson Exp $
+ * $Id: pike_macros.h,v 1.30 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef MACROS_H
 #define MACROS_H
diff --git a/src/pike_memory.c b/src/pike_memory.c
index 7df11e10bdd897e451620378c6dd9a5393fbff34..483dc0f364c1b1f98fb916e31bd6068b2d3ccd0b 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -10,7 +10,7 @@
 #include "pike_macros.h"
 #include "gc.h"
 
-RCSID("$Id: pike_memory.c,v 1.118 2002/01/16 02:54:17 nilsson Exp $");
+RCSID("$Id: pike_memory.c,v 1.119 2002/05/31 22:41:25 nilsson Exp $");
 
 /* strdup() is used by several modules, so let's provide it */
 #ifndef HAVE_STRDUP
diff --git a/src/pike_memory.h b/src/pike_memory.h
index 0602c9bc2afa47013486601e9f7b5a31d237bb06..75fd8aaa4c4bd25aa6fbf781ac4028536e2eab10 100644
--- a/src/pike_memory.h
+++ b/src/pike_memory.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: pike_memory.h,v 1.31 2002/01/16 02:54:17 nilsson Exp $
+ * $Id: pike_memory.h,v 1.32 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef MEMORY_H
 #define MEMORY_H
diff --git a/src/pike_types.c b/src/pike_types.c
index eb1407e290d394ea4d8d81084386313bcba9b72b..f6c7e6f51dd9c021d39a241f2df475bde8a47b7b 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: pike_types.c,v 1.185 2002/05/15 14:48:29 grubba Exp $");
+RCSID("$Id: pike_types.c,v 1.186 2002/05/31 22:41:25 nilsson Exp $");
 #include <ctype.h>
 #include "svalue.h"
 #include "pike_types.h"
diff --git a/src/pike_types.h b/src/pike_types.h
index 5667b3b60c0127b8d2f4f67f3cdb9099ffa96f91..68723aa3a8c1d98952b8af9013c6014b64b21f5d 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: pike_types.h,v 1.76 2002/05/15 14:48:29 grubba Exp $
+ * $Id: pike_types.h,v 1.77 2002/05/31 22:41:25 nilsson Exp $
  */
 #ifndef PIKE_TYPES_H
 #define PIKE_TYPES_H
diff --git a/src/port.c b/src/port.c
index 68eaf0f0a6eb7e796b87d3e42ab545f2bb9e0a62..16beb58d60d61990c6d7a2f4105a8c86798a1e39 100644
--- a/src/port.c
+++ b/src/port.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #define PORT_DO_WARN
@@ -22,7 +22,7 @@
 #include <float.h>
 #include <string.h>
 
-RCSID("$Id: port.c,v 1.50 2002/01/16 02:54:18 nilsson Exp $");
+RCSID("$Id: port.c,v 1.51 2002/05/31 22:41:25 nilsson Exp $");
 
 #ifdef sun
 time_t time PROT((time_t *));
diff --git a/src/port.h b/src/port.h
index c72c5d2c8c895097bbff4c9f01809e544db0a966..0409c51296aa2dc80ea274a7f4456e3b1f03f52e 100644
--- a/src/port.h
+++ b/src/port.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: port.h,v 1.42 2002/01/16 02:54:18 nilsson Exp $
+ * $Id: port.h,v 1.43 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef PORT_H
 #define PORT_H
diff --git a/src/program.c b/src/program.c
index 348c92d7d05c75ed16ec7b5d74dec7ef16ae7197..bf29a578af3271ea479fe079eeed140d27e329d7 100644
--- a/src/program.c
+++ b/src/program.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: program.c,v 1.431 2002/05/12 01:23:15 mast Exp $");
+RCSID("$Id: program.c,v 1.432 2002/05/31 22:41:26 nilsson Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
diff --git a/src/program.h b/src/program.h
index 84a25565d836952aed1465de999f3028b2c77b6b..cac37118ae0e375c9f68028e4526a1652364902d 100644
--- a/src/program.h
+++ b/src/program.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: program.h,v 1.160 2002/05/11 21:08:00 mast Exp $
+ * $Id: program.h,v 1.161 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef PROGRAM_H
 #define PROGRAM_H
diff --git a/src/rusage.c b/src/rusage.c
index 7588b4c3b83e39c294c7b8160ba59bca2cae64ad..1f2109facfb1e36d1fd13fdc71d2f9e2dc1f86b4 100644
--- a/src/rusage.c
+++ b/src/rusage.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -17,7 +17,7 @@
 #include <errno.h>
 #include "rusage.h"
 
-RCSID("$Id: rusage.c,v 1.17 2002/01/16 02:54:19 nilsson Exp $");
+RCSID("$Id: rusage.c,v 1.18 2002/05/31 22:41:26 nilsson Exp $");
 
 #ifdef HAVE_SYS_TIMES_H
 #include <sys/times.h>
diff --git a/src/rusage.h b/src/rusage.h
index 45d03180c314dba205b0a3b25cfe1a1086d86c1b..fa29282910c5895c0fda8cce48cb623b10606929 100644
--- a/src/rusage.h
+++ b/src/rusage.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: rusage.h,v 1.4 2002/01/16 02:54:19 nilsson Exp $
+ * $Id: rusage.h,v 1.5 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef RUSAGE_H
 #define RUSAGE_H
diff --git a/src/signal_handler.c b/src/signal_handler.c
index b99c11a3dd544f8a89ebffacc3555cf75515154b..4f392a187dcd7617990c3ecf7368884b8aa08cf6 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -25,7 +25,7 @@
 #include "main.h"
 #include <signal.h>
 
-RCSID("$Id: signal_handler.c,v 1.223 2002/05/11 00:29:41 nilsson Exp $");
+RCSID("$Id: signal_handler.c,v 1.224 2002/05/31 22:41:26 nilsson Exp $");
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
diff --git a/src/signal_handler.h b/src/signal_handler.h
index 8c226d2453315c490698c82154f1b7427b56d043..25e45df968db73ebd39404a37963c67246501432 100644
--- a/src/signal_handler.h
+++ b/src/signal_handler.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: signal_handler.h,v 1.12 2002/01/16 02:54:19 nilsson Exp $
+ * $Id: signal_handler.h,v 1.13 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef SIGNAL_H
 #define SIGNAL_H
diff --git a/src/stralloc.c b/src/stralloc.c
index a5e66827866ab504eb58f7d3dc6aab7d78d2bdc2..b51660ff51d29fa1cff89927a04de38644cffa1c 100644
--- a/src/stralloc.c
+++ b/src/stralloc.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -27,7 +27,7 @@
 #define HUGE HUGE_VAL
 #endif /*!HUGE*/
 
-RCSID("$Id: stralloc.c,v 1.141 2002/05/10 23:55:51 nilsson Exp $");
+RCSID("$Id: stralloc.c,v 1.142 2002/05/31 22:41:26 nilsson Exp $");
 
 /* #define STRALLOC_USE_PRIMES */
 
diff --git a/src/stralloc.h b/src/stralloc.h
index 45d8510ff24f29de3e0670e01994fbbdcd5ce6ba..19708c0fed476daeb480c3e8aebd1e23afa5ecc8 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: stralloc.h,v 1.64 2002/01/16 02:54:19 nilsson Exp $
+ * $Id: stralloc.h,v 1.65 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef STRALLOC_H
 #define STRALLOC_H
diff --git a/src/stuff.c b/src/stuff.c
index 1be9b4ce894cd5ce874fd2ba8e22235b95f1e65d..b439ed9556f0dea2b8f1c7e50b527c2ced0bf3ec 100644
--- a/src/stuff.c
+++ b/src/stuff.c
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: stuff.c,v 1.17 2002/04/30 01:06:08 mast Exp $
+ * $Id: stuff.c,v 1.18 2002/05/31 22:41:26 nilsson Exp $
  */
 #include "global.h"
 #include "stuff.h"
diff --git a/src/stuff.h b/src/stuff.h
index 2c384f7051cda521bcf4b9e88f4ae58486f1253c..9e9f779e688f80a327e6cb7564d784c3fad53f20 100644
--- a/src/stuff.h
+++ b/src/stuff.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: stuff.h,v 1.13 2002/01/16 02:54:20 nilsson Exp $
+ * $Id: stuff.h,v 1.14 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef STUFF_H
 #define STUFF_H
diff --git a/src/svalue.c b/src/svalue.c
index 67dd603a1a249fe7f9bea8813272eca3942db61e..1a97d296135de7341892c08b7cb67e80343c106c 100644
--- a/src/svalue.c
+++ b/src/svalue.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 #include "global.h"
@@ -65,7 +65,7 @@ static int pike_isnan(double x)
 #endif /* HAVE__ISNAN */
 #endif /* HAVE_ISNAN */
 
-RCSID("$Id: svalue.c,v 1.139 2002/05/15 09:07:42 grubba Exp $");
+RCSID("$Id: svalue.c,v 1.140 2002/05/31 22:41:26 nilsson Exp $");
 
 struct svalue dest_ob_zero = {
   T_INT, 0,
diff --git a/src/svalue.h b/src/svalue.h
index f54fada164e831e2c11f5153a465c8a039d22d17..a88befb3ba3e627cc0142a099b0a205a91e96cad 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -1,11 +1,11 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
 /*
- * $Id: svalue.h,v 1.103 2002/05/02 09:14:46 mast Exp $
+ * $Id: svalue.h,v 1.104 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef SVALUE_H
 #define SVALUE_H
diff --git a/src/time_stuff.h b/src/time_stuff.h
index 279275be6fd78e0a67ff0d1fc05952674dc3e51f..f8e42615f6abd62f8fd173b22d9aa2e14e14b9d6 100644
--- a/src/time_stuff.h
+++ b/src/time_stuff.h
@@ -1,10 +1,10 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /*
- * $Id: time_stuff.h,v 1.9 2002/01/16 02:54:21 nilsson Exp $
+ * $Id: time_stuff.h,v 1.10 2002/05/31 22:41:26 nilsson Exp $
  */
 #ifndef TIME_STUFF_H
 #define TIME_STUFF_H
diff --git a/src/version.c b/src/version.c
index 50202673a6fff9e2163713d57d128b327de233c1..1cb9478a03eb4c37c443a615e2ffa70eaee0bb81 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1,7 +1,7 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 /**/
 
@@ -11,7 +11,7 @@
 #include "stralloc.h"
 #include "version.h"
 
-RCSID("$Id: version.c,v 1.134 2002/01/16 02:54:21 nilsson Exp $");
+RCSID("$Id: version.c,v 1.135 2002/05/31 22:41:26 nilsson Exp $");
 
 #define STR(X) #X
 /*! @decl string version()
diff --git a/src/version.h b/src/version.h
index d2ef1f365572824ba017f19e956ce658f9b6e9ed..bd368dcfd29155831e3811ac8e67fd04f5ca29ea 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,10 +1,10 @@
 /*\
 ||| This file is part of Pike. For copyright information see COPYRIGHT.
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
+||| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
+||| for more information.
 \*/
 
-/* $Id: version.h,v 1.312 2002/05/11 20:28:14 nilsson Exp $ */
+/* $Id: version.h,v 1.313 2002/05/31 22:41:26 nilsson Exp $ */
 
 #define PIKE_MAJOR_VERSION 7
 #define PIKE_MINOR_VERSION 3