--- a/src/modules/publish/dependencies.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/modules/publish/dependencies.py	Wed May 05 16:53:49 2010 -0700
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 import itertools

--- a/src/pkgdep.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/pkgdep.py	Wed May 05 16:53:49 2010 -0700
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 import errno

--- a/src/tests/api/t_api_search.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/tests/api/t_api_search.py	Wed May 05 16:53:49 2010 -0700
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
 import testutils
 if __name__ == "__main__":

--- a/src/tests/cli/t_pkgdep.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/tests/cli/t_pkgdep.py	Wed May 05 16:53:49 2010 -0700
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
 import testutils
 if __name__ == "__main__":

--- a/src/tests/cli/t_pkgdep_resolve.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/tests/cli/t_pkgdep_resolve.py	Wed May 05 16:53:49 2010 -0700
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
 import testutils
 if __name__ == "__main__":

--- a/src/tests/pkg5unittest.py	Wed May 05 16:17:52 2010 -0700
+++ b/src/tests/pkg5unittest.py	Wed May 05 16:53:49 2010 -0700
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
 import baseline
 import copy