Bugzilla bug #53114: fixed license in nss/cmd/zlib/Makefile and

manifest.mn.  Thanks to Brian Ryner <bryner@netscape.com> for the bug
report.

security/nss/cmd/zlib/Makefile

@@ -1,12 +1,35 @@
 #! gmake
 #
-#           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+# The contents of this file are subject to the Mozilla Public
-#              NETSCAPE COMMUNICATIONS CORPORATION
+# License Version 1.1 (the "License"); you may not use this file
-# Copyright ¿ 1996, 1997 Netscape Communications Corporation.  All Rights
+# except in compliance with the License. You may obtain a copy of
-# Reserved.  Use of this Source Code is subject to the terms of the
+# the License at http://www.mozilla.org/MPL/
-# applicable license agreement from Netscape Communications Corporation.
+# 
-# The copyright notice(s) in this Source Code does not indicate actual or
+# Software distributed under the License is distributed on an "AS
-# intended publication of this Source Code.
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
 #
 
 #######################################################################

security/nss/cmd/zlib/manifest.mn

@@ -1,11 +1,34 @@
 #
-#           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+# The contents of this file are subject to the Mozilla Public
-#              NETSCAPE COMMUNICATIONS CORPORATION
+# License Version 1.1 (the "License"); you may not use this file
-# Copyright ¿ 1996, 1997 Netscape Communications Corporation.  All Rights
+# except in compliance with the License. You may obtain a copy of
-# Reserved.  Use of this Source Code is subject to the terms of the
+# the License at http://www.mozilla.org/MPL/
-# applicable license agreement from Netscape Communications Corporation.
+# 
-# The copyright notice(s) in this Source Code does not indicate actual or
+# Software distributed under the License is distributed on an "AS
-# intended publication of this Source Code.
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
 #
 
 CORE_DEPTH = ../../..