--- a/make-rules/ips.mk	Mon Feb 11 08:45:58 2013 -0800
+++ b/make-rules/ips.mk	Mon Feb 11 08:59:55 2013 -0800
@@ -255,7 +255,7 @@
 
 
 # published
-PKGSEND_PUBLISH_OPTIONS = -s $(PKG_REPO) publish --fmri-in-manifest
+PKGSEND_PUBLISH_OPTIONS = -s $(WS_REPO) publish --fmri-in-manifest
 PKGSEND_PUBLISH_OPTIONS += $(PKG_PROTO_DIRS:%=-d %)
 PKGSEND_PUBLISH_OPTIONS += -T \*.py
 $(MANIFEST_BASE)-%.published:	$(MANIFEST_BASE)-%.depend.res $(BUILD_DIR)/.linted-$(MACH)

--- a/transforms/locale	Mon Feb 11 08:45:58 2013 -0800
+++ b/transforms/locale	Mon Feb 11 08:59:55 2013 -0800
@@ -20,14 +20,17 @@
 #
 
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # general locale
 <transform dir link hardlink path=.*/locale$ -> default facet.locale true>
 
+# add locale specific facets to using the the locale name encoded in
+# the pathname.  We don't need the portion after the '@' or '.', only
+# .../locale/{locale-name}[@.]*.
 <transform dir file link hardlink \
-    path=.*/locale/([^/]+)(\..+){0,1}(/.+){0,1}$ -> \
+    path=.*/locale/([^/@\.]+)(.+){0,1}(/.+){0,1}$ -> \
     default facet.locale.%<\1> true>
 
 # unfacet the C locale