Change copyright notice from UC to LLNS.

COPYING

@@ -17,27 +17,27 @@ also delete it here.
 
 OUR NOTICE AND TERMS OF AND CONDITIONS OF THE GNU GENERAL PUBLIC LICENSE
 
-Our Preamble Notice
+Auspices
 
-A. This notice is required to be provided under our contract with the U.S.
-Department of Energy (DOE). This work was produced at the University
-of California, Lawrence Livermore National Laboratory under Contract
-No. W-7405-ENG-48 with the DOE.
+This work performed under the auspices of the U.S. Department of Energy by 
+Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
 
-B. Neither the United States Government nor the University of California
-nor any of their employees, makes any warranty, express or implied, or
-assumes any liability or responsibility for the accuracy, completeness, or
-usefulness of any information, apparatus, product, or process disclosed, or
-represents that its use would not infringe privately-owned rights.
+Disclaimer
 
-C. Also, reference herein to any specific commercial products, process, or
-services by trade names, trademark, manufacturer or otherwise does not
+This work was sponsored by an agency of the United States government. 
+Neither the United States Government nor Lawrence Livermore National 
+Security, LLC, nor any of their employees, makes any warranty, express 
+or implied, or assumes any liability or responsibility for the accuracy, 
+completeness, or usefulness of any information, apparatus, product, or 
+process disclosed, or represents that its use would not infringe privately
+owned rights. References herein to any specific commercial products, process, 
+or services by trade names, trademark, manufacturer or otherwise does not
 necessarily constitute or imply its endorsement, recommendation, or
-favoring by the United States Government or the University of California.
-The views and opinions of authors expressed herein do not necessarily
-state or reflect those of the United States Government or the University of
-California, and shall not be used for advertising or product endorsement
-purposes.
+favoring by the United States Government or the Lawrence Livermore National
+Security, LLC. The views and opinions of authors expressed herein do not 
+necessarily state or reflect those of the United States government or 
+Lawrence Livermore National Security, LLC, and shall not be used for 
+advertising or product endorsement purposes.
 
 =============================================================================
 

DISCLAIMER

-Copyright (C) 2002-2006 The Regents of the University of California.
+Copyright (C) 2002-2007 The Regents of the University of California.
 Produced at Lawrence Livermore National Laboratory, Hewlett-Packard, 
-Linux NetworX, and other sites.
+Bull, Linux NetworX, and others.
 
 Written by:
-Ernest Artiaga <ernest.artiaga@bsc.es>
-Danny Auble <auble1@llnl.gov>
-Susanne Balle <susanne.balle@hp.com>
-Daniel Christians <Daniel.Christians@hp.com>
-Chris Dunlap <cdunlap@llnl.gov>
-Joey Ekstrom <ekstrom1@llnl.gov>
-Jim Garlick <garlick@llnl.gov>
-Mark Grondona <grondona1@llnl.gov>
-Christopher Holmes <cholmes@hp.com>
-Takae Hatazaki <takao.hatazaki@hp.com>
-Nathan Huff <nhuff@geekshanty.com>
-David Jackson <jacksond@clusterresources.com>
-Greg Johnson <gjohnson@lanl.gov>
-Morris Jette <jette1@llnl.gov>
-Jason King <king49@llnl.gov>
-Chris Morrone <morrone2@llnl.gov>
-Brian O'Sullivan <bos@pathscale.com>
-Daniel Palermo <dan.palermo@hp.com>
-Dan Phung <phung4@llnl.gov>
-Andy Riebs <Andy.Riebs@hp.com>
-Jeff Squyres <jsquyres@lam-mpi.org>
-Keven Tew <tew1@llnl.gov>
-Jay Windley <jwindley@lnxi.com>
+Don Albert <Don.Albert(at)bull.com>
+Ernest Artiaga <ernest.artiaga(at)bsc.es>
+Danny Auble <auble1(at)llnl.gov>
+Susanne Balle <susanne.balle(at)hp.com>
+Anton Blanchard <anton(at)samba.org>
+Hongjia Cao <hgcao(at)nudt.edu.cn>
+Chuck Clouston <Chuck.Clouston(at)bull.com>
+Daniel Christians <Daniel.Christians(at)hp.com>
+Gilles Civario <gilles.civario(at)bull.net>
+Chris Dunlap <cdunlap(at)llnl.gov>
+Joey Ekstrom <ekstrom1(at)llnl.gov>
+Jim Garlick <garlick(at)llnl.gov>
+Mark Grondona <mgrondona(at)llnl.gov>
+Christopher Holmes <cholmes(at)hp.com>
+Takao Hatazaki <takao.hatazaki(at)hp.com>
+Nathan Huff <nhuff(at)geekshanty.com>
+David Jackson <jacksond(at)clusterresources.com>
+Greg Johnson <gjohnson(at)lanl.gov>
+Morris Jette <jette1(at)llnl.gov>
+Jason King <king49(at)llnl.gov>
+Nancy Kritkausky <Nancy.Kritkausky(at)bull.com>
+Bernard Li <bli(at)bcgsc.ca>
+Puenlap Lee <Puen-Lap.Lee(at)bull.com>
+Donna Mecozzi <mecozzi1(at)llnl.gov>
+Chris Morrone <morrone2(at)llnl.gov>
+Bryan O'Sullivan <bos(at)pathscale.com>
+Gennaro Oliva <oliva.g(at)na.icar.cnr.it>
+Daniel Palermo <dan.palermo(at)hp.com>
+Dan Phung <phung4(at)llnl.gov>
+Ashley Pitman <ashley(at)quadrics.com>
+Andy Riebs <Andy.Riebs(at)hp.com>
+Asier Roa <asier.roa(at)bsc.es>
+Federico Sacerdoti <Federico.Sacerdoti(at)deshaw.com>
+Jeff Squyres <jsquyres(at)lam-mpi.org>
+Keven Tew <tew1(at)llnl.gov>
+Prashanth Tamraparni <prashanth.tamraparni(at)hp.com>
+Jay Windley <jwindley(at)lnxi.com>
+Ann-Marie Wunderlin<Anne-Marie.Wunderlin(at)Bull.com>
 
 UCRL-CODE-226842.
 
@@ -51,25 +66,27 @@ OUR NOTICE AND TERMS OF AND CONDITIONS OF THE GNU GENERAL PUBLIC LICENSE
 
 Our Preamble Notice
 
-A. This notice is required to be provided under our contract with the U.S.
-Department of Energy (DOE). This work was produced at the University 
-of California, Lawrence Livermore National Laboratory under Contract 
-No. W-7405-ENG-48 with the DOE.
+Auspices
 
-B. Neither the United States Government nor the University of California 
-nor any of their employees, makes any warranty, express or implied, or 
-assumes any liability or responsibility for the accuracy, completeness, or 
-usefulness of any information, apparatus, product, or process disclosed, or 
-represents that its use would not infringe privately-owned rights.
+This work performed under the auspices of the U.S. Department of Energy by 
+Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
 
-C. Also, reference herein to any specific commercial products, process, or 
-services by trade names, trademark, manufacturer or otherwise does not 
-necessarily constitute or imply its endorsement, recommendation, or 
-favoring by the United States Government or the University of California. 
-The views and opinions of authors expressed herein do not necessarily 
-state or reflect those of the United States Government or the University of 
-California, and shall not be used for advertising or product endorsement 
-purposes.
+Disclaimer
+
+This work was sponsored by an agency of the United States government. 
+Neither the United States Government nor Lawrence Livermore National 
+Security, LLC, nor any of their employees, makes any warranty, express 
+or implied, or assumes any liability or responsibility for the accuracy, 
+completeness, or usefulness of any information, apparatus, product, or 
+process disclosed, or represents that its use would not infringe privately
+owned rights. References herein to any specific commercial products, process, 
+or services by trade names, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or the Lawrence Livermore National
+Security, LLC. The views and opinions of authors expressed herein do not 
+necessarily state or reflect those of the United States government or 
+Lawrence Livermore National Security, LLC, and shall not be used for 
+advertising or product endorsement purposes.
 
 The precise terms and conditions for copying, distribution and modification 
 is provided in the file named "COPYING" in this directory.