--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Aug 06 16:29:39 2008 -0600
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+syntax: glob
+*

--- a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # MM_Solaris_ON.pm overrides various parts of MakeMaker so that perl modules
@@ -45,7 +43,7 @@
 use strict;
 use warnings;
 our ($VERSION, @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 @ISA = qw(ExtUtils::MM_Any ExtUtils::MM_Unix);

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Catalog.pm contains perl code for exacct catalog tag manipulation.
 # 
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Exacct::Catalog;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use Carp;
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Exacct.pm contains wrappers for the exacct error functions and syscalls,
 # and some 'shorthand' convenience functions.
@@ -34,7 +34,7 @@
 
 package Sun::Solaris::Exacct;
 
-our $VERSION = '%I%';
+our $VERSION = '1.5';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # File.pm contains wrappers for the exacct file manipulation routines.
 # 
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Exacct::File;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +21,7 @@
 # Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Object.pm contains perl code for exacct object manipulation.
 #
@@ -33,7 +32,7 @@
 
 package Sun::Solaris::Exacct::Object;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Exacct.pm.  This in turn contains the SID of the Exacct.pm file, so if anything
-under this directory is modified, a delta should be made to Exacct.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Exacct.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Exacct.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Kstat.pm provides the bootstrap for the Sun::Solaris::Kstat module.
@@ -34,7 +32,7 @@
 use strict;
 use DynaLoader;
 use vars qw($VERSION @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(DynaLoader);
 bootstrap Sun::Solaris::Kstat $VERSION;
 1;

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-Version %I%
+Version 1.1
 Initial Public Source release.

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,16 +23,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Lgrp.pm provides procedural and object-oriented interface to the Solaris
 # liblgrp(3LIB) library.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 require 5.6.1;
 use strict;
@@ -41,7 +37,7 @@
 
 package Sun::Solaris::Lgrp;
 
-our $VERSION = '%I%';
+our $VERSION = '1.1';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -20,22 +20,19 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Lgrp.pm.  This in turn contains the SID of the Lgrp.pm file, so if
-anything under this directory is modified, a delta should be made to Lgrp.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Lgrp.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Lgrp.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,13 +21,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 use strict;
 use warnings;
 use Config;
-our $VERSION = '%I%';
+our $VERSION = '1.2';
 
 my $fh;
 open($fh, ">$ARGV[0]") || die("Can't open perlgcc: $!\n");
@@ -44,13 +41,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%$ARGV[0]	%I%	%E% SMI"
-#
 
 use $perlver;
 use strict;
 use warnings;
-our \$VERSION = '%I%';
+our \$VERSION = '$VERSION';
 
 \$ENV{PERL5_OVERRIDE_CONFIG} = '1';
 if (exists(\$ENV{PERL5LIB})) {

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Privilege.pm provides the bootstrap for the Sun::Solaris::Privilege module.
 #
@@ -33,7 +33,7 @@
 
 package Sun::Solaris::Privilege;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Project.pm provides the bootstrap for the Sun::Solaris::Project module, and
 # also functions for reading, validating and writing out project(4) format
@@ -41,7 +41,7 @@
 
 package Sun::Solaris::Project;
 
-our $VERSION = '%I%';
+our $VERSION = '1.9';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Project.pm.  This in turn contains the SID of the Project.pm file, so if
-anything under this directory is modified, a delta should be made to Project.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Project.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Project.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Task.pm.  This in turn contains the SID of the Task.pm file, so if anything
-under this directory is modified, a delta should be made to Task.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Task.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Task.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,6 +1,3 @@
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Task.pm provides the bootstrap for the Sun::Solaris::Task module.
 #
@@ -32,7 +34,7 @@
 
 package Sun::Solaris::Task;
 
-our $VERSION = '%I%';
+our $VERSION = '1.4';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Ucred.pm provides the bootstrap for the Sun::Solaris::Ucred module.
 #
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Ucred;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 

--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Utils.pm provides the bootstrap for the Sun::Solaris::Utils module.
@@ -35,7 +33,7 @@
 use Exporter;
 use DynaLoader;
 use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = qw(gmatch gettext textdomain bindtextdomain dcgettext dgettext);
 bootstrap Sun::Solaris::Utils $VERSION;

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveProjectModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveProjectModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of a Solaris project.
  * It encapsulates a CIM instance of the Solaris_ActiveProject class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 
 public class ActiveProjectModel extends SRMProviderDataModel

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveUserModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveUserModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of an active user that is actively running on an OperatingSystem.
  * It encapsulates a CIM instance of the Solaris_ActiveUser class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ActiveUserModel extends SRMProviderDataModel
 	implements SRMProviderProperties, Solaris_ActiveUserProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/DataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/DataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Aggregation of all users, projects, and sets metrics data.
  * Implements the singleton pattern
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 class DataModel {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessAggregateDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessAggregateDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * a Solaris_ProjectProcessAggregateStatisticalInformation
  * or Solaris_UserProcessAggregateStatisticalInformation class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ProcessAggregateDataModel extends ProcessDataModel {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of Process Utilization. It encapsulates a CIM instance of
  * a Solaris_ProcessStatisticalInformation class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ProcessDataModel extends SRMProviderDataModel
 	implements SRMProviderProperties,

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ResourceMonitor.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ResourceMonitor.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -37,7 +34,6 @@
  * Mediator between data model the native interface and the client.
  * Implements the singleton pattern.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public final class ResourceMonitor {
     /**

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProvider.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProvider.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -51,7 +48,6 @@
  * contains several utility methods which may be useful to the individual
  * provider classes.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public abstract class SRMProvider
 	implements InstanceProvider, MethodProvider, SRMProviderProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
 /**
  * This is the base class for the SRM provider data models.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 abstract class SRMProviderDataModel implements SRMProviderProperties {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderProperties.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderProperties.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -35,7 +32,6 @@
  * This class defines common properties used in Acacia
  * providers.
  * @author SMI
- * @version %R%
  */
 public interface SRMProviderProperties {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SetProp.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SetProp.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -37,7 +34,6 @@
  * This is the base class for set property classes. Each
  * derived class can format a string into one CIM data format.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 abstract class SetProp implements PropertyAccessInterface {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProject.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProject.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -46,7 +43,6 @@
  * Provider of the Solaris_ActiveProject class. This class represents
  * a Project that is actively running on an OperatingSystem.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ActiveProject extends SRMProvider
 	implements Authorizable, Solaris_ActiveProjectProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProjectProcessAggregateStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProjectProcessAggregateStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -44,7 +41,6 @@
  * This class represents a link between a Project active on a system and the
  * aggregated resource usage of its Process(es).
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class  Solaris_ActiveProjectProcessAggregateStatistics
 	extends SRMProvider {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUser.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUser.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -46,7 +43,6 @@
  * Provider of the Solaris_ActiveUser class. This class represents
  * a ActiveUser that is actively running on an OperatingSystem.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ActiveUser extends SRMProvider
 	implements Authorizable, Solaris_ActiveUserProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUserProcessAggregateStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUserProcessAggregateStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -44,7 +41,6 @@
  * This class represents a link between an User active on a system and the
  * aggregated resource usage of its Process(es).
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class  Solaris_ActiveUserProcessAggregateStatistics extends SRMProvider {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -45,7 +42,6 @@
  * Provider of the Solaris_ProcessStatisticalInformation class.
  * This class provides raw resource utilization measurements for a process.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ProcessStatisticalInformation extends SRMProvider
 	implements Solaris_ProcessStatisticalInformationProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformationProperties.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformationProperties.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -35,7 +32,6 @@
  * Defines property names of the Solaris_ProcessStatisticalInformation and
  * the corresponding keys in the RDS protocol
  * @author SMI
- * @version %R%
  */
 public interface Solaris_ProcessStatisticalInformationProperties {
     /**

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -43,7 +40,6 @@
  * Solaris_ProcessStatisticalInformation instance a raw resource utilization
  * measurements for a process.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class Solaris_ProcessStatistics extends SRMProvider {
 

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProjectProcessAggregateStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProjectProcessAggregateStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -49,7 +46,6 @@
  * ProcessStatisticalInformation properties are populated by summing the
  * underlying process's usage.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ProjectProcessAggregateStatisticalInformation
 	extends SRMProvider

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_UserProcessAggregateStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_UserProcessAggregateStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -49,7 +46,6 @@
  * ProcessStatisticalInformation properties are populated by summing the
  * underlying process' usage.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_UserProcessAggregateStatisticalInformation
 	extends SRMProvider

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SystemDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SystemDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
  * class. The data fields are defined as static in the superclass, since they
  * should be accessible by all provider data models.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class SystemDataModel extends SRMProviderDataModel
 	implements SRMProviderProperties {

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Util.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Util.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
 /**
  * Utility class 
  * @author Sun Microsystems
- * @version %I% %G%
  */
 class Util {
     

--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/rmon.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/rmon.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -38,7 +35,6 @@
  * Simple CLI to test ResourceMonitor class. Prints the current user, projects
  * and processor sets metrics on the stdout.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class rmon {
 

--- a/usr/src/common/atomic/amd64/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/amd64/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 

--- a/usr/src/common/atomic/i386/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/i386/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 

--- a/usr/src/common/atomic/sparc/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/sparc/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 

--- a/usr/src/common/atomic/sparcv9/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/sparcv9/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 

--- a/usr/src/lib/c_synonyms/amd64/synonyms.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/c_synonyms/amd64/synonyms.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"synonyms.s"
 
 #define	SYN(name)				\
 	.align	16;				\