--- a/usr/src/uts/Makefile.uts Fri Nov 04 09:47:33 2011 -0500
+++ b/usr/src/uts/Makefile.uts Sat Nov 05 17:34:13 2011 -0700
@@ -22,6 +22,7 @@
#
# Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011 Bayard G. Bell. All rights reserved.
+# Copyright (c) 2011 by Delphix. All rights reserved.
#
#
@@ -317,8 +318,8 @@
# is not being used, the value of $VERSION will be used.
#
# For the ease of developers dropping modules onto possibly unrelated systems,
-# you can set NO_GENUNIX_MERGE= in the environment to skip uniquifying against
-# genunix.
+# you can set NO_GENUNIX_UNIQUIFY= in the environment to skip uniquifying
+# against genunix.
#
NO_GENUNIX_UNIQUIFY=$(POUND_SIGN)
SKIP_GENUNIX_UNIQUIFY=no