--- a/components/python/python26/python-26.p5m	Tue Feb 17 10:18:43 2015 -0800
+++ b/components/python/python26/python-26.p5m	Tue Feb 17 13:07:15 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -31,31 +31,25 @@
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2009/043
+set name=org.opensolaris.arc-caseid value=PSARC/2009/043 value=PSARC/2015/084
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# isapython2.6
-file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
-file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
+#
 link path=usr/bin/$(MACH64)/python target=python2.6 mediator=python \
     mediator-version=2.6
 link path=usr/bin/$(MACH64)/python-config target=python2.6-config \
     mediator=python mediator-version=2.6
-link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
+file path=usr/bin/$(MACH64)/python2.6
 file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
 link path=usr/bin/2to3 target=2to3-2.6 mediator=python mediator-version=2.6
 file usr/bin/2to3 path=usr/bin/2to3-2.6
 link path=usr/bin/idle target=idle-2.6 mediator=python mediator-version=2.6
 file usr/bin/idle path=usr/bin/idle-2.6
-hardlink path=usr/bin/isapython2.6 target=../lib/isaexec
 link path=usr/bin/pydoc target=pydoc-2.6 mediator=python mediator-version=2.6
 file usr/bin/pydoc path=usr/bin/pydoc-2.6
 link path=usr/bin/python target=python2.6 mediator=python mediator-version=2.6
 link path=usr/bin/python-config target=python2.6-config mediator=python \
     mediator-version=2.6
-
-# python2.6
-link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
+file path=usr/bin/python2.6
 file path=usr/bin/python2.6-config
 #file path=usr/bin/smtpd.py
 #file path=usr/bin/$(MACH64)/smtpd.py

--- a/components/python/python27/python-27.p5m	Tue Feb 17 10:18:43 2015 -0800
+++ b/components/python/python27/python-27.p5m	Tue Feb 17 13:07:15 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,24 +32,17 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/514 value=PSARC/2009/529 \
-    value=PSARC/2014/183
+    value=PSARC/2014/183 value=PSARC/2015/084
 # PSARC 2008/514 Python interface to dlpi(7P)
 # PSARC 2009/529 Python interface to privileges(5) & rbac(5)
 # PSARC 2014/183 Python 2.7.6
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#file path=usr/bin/smtpd.py
-#file path=usr/bin/$(MACH64)/smtpd.py
-#
-file usr/bin/python2.7 path=usr/bin/$(MACH32)/isapython2.7
-link path=usr/bin/$(MACH32)/python2.7 target=isapython2.7
-file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
 link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python \
     mediator-version=2.7
 link path=usr/bin/$(MACH64)/python-config target=python2.7-config \
     mediator=python mediator-version=2.7
-link path=usr/bin/$(MACH64)/python2.7 target=isapython2.7
-#
+file path=usr/bin/$(MACH64)/python2.7
 file path=usr/bin/$(MACH64)/python2.7-config
 link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7
 #
@@ -59,13 +52,15 @@
 file usr/bin/2to3 path=usr/bin/2to3-2.7
 link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7
 file usr/bin/idle path=usr/bin/idle-2.7
-hardlink path=usr/bin/isapython2.7 target=../lib/isaexec
 link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7
 file usr/bin/pydoc path=usr/bin/pydoc-2.7
 link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7
 link path=usr/bin/python-config target=python2.7-config mediator=python \
     mediator-version=2.7
-link path=usr/bin/python2.7 target=$(MACH32)/isapython2.7
+#file path=usr/bin/smtpd.py
+#file path=usr/bin/$(MACH64)/smtpd.py
+#
+file path=usr/bin/python2.7
 file path=usr/bin/python2.7-config
 file path=usr/include/python2.7/Python-ast.h
 file path=usr/include/python2.7/Python.h