--- a/usr/src/cmd/rad/daemon/rad_smf.c	Sun Apr 15 13:25:07 2012 -0400
+++ b/usr/src/cmd/rad/daemon/rad_smf.c	Sun Apr 15 13:51:55 2012 -0400
@@ -174,7 +174,8 @@
 		structfield_t *sf = &type->t_aux.t_fields[i];
 		data_t *data = rad_smf_read_prop(pg, sf->sf_name, sf->sf_type);
 		if (data == NULL && !sf->sf_nullable) {
-			rad_log(RL_WARN, "non-nullable property not found: %s\n",
+			rad_log(RL_WARN,
+			    "non-nullable property not found: %s\n",
 			    sf->sf_name);
 			continue;
 		}

--- a/usr/src/cmd/rad/mod/test-compat-cnew/mod_test_compat_cnew.c	Sun Apr 15 13:25:07 2012 -0400
+++ b/usr/src/cmd/rad/mod/test-compat-cnew/mod_test_compat_cnew.c	Sun Apr 15 13:51:55 2012 -0400
@@ -229,9 +229,9 @@
 api_CompatTest_invoke_retvalTest(rad_instance_t *inst, adr_method_t *meth,
     data_t **ret, data_t **args, int count, data_t **error)
 {
-	/* 
-	 * Method with non-nullable arg, 
-	 * non-nullable return value (was nullable) 
+	/*
+	 * Method with non-nullable arg,
+	 * non-nullable return value (was nullable)
 	 */
 	const char *s = data_to_string(args[0]);
 	*ret = data_new_string(s, lt_copy);
@@ -243,9 +243,9 @@
 api_CompatTest_invoke_argvalTest(rad_instance_t *inst, adr_method_t *meth,
     data_t **ret, data_t **args, int count, data_t **error)
 {
-	/* 
-	 * Method with nullable arg (was non-nullable), 
-	 * non-nullable return value 
+	/*
+	 * Method with nullable arg (was non-nullable),
+	 * non-nullable return value
 	 */
 	if (args[0] != NULL) {
 		const char *s = data_to_string(args[0]);

--- a/usr/src/test/python/client/test_derivedtypes.py	Sun Apr 15 13:25:07 2012 -0400
+++ b/usr/src/test/python/client/test_derivedtypes.py	Sun Apr 15 13:51:55 2012 -0400
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 import os