--- a/components/python/coverage/coverage-26.p5m	Wed Aug 03 01:08:07 2011 -0700
+++ b/components/python/coverage/coverage-26.p5m	Wed Aug 03 13:45:11 2011 -0700
@@ -33,8 +33,11 @@
     value=http://arc.opensolaris.org/caselog/PSARC/2011/260
 
 license coverage.copyright license=BSD
-license jquery.copyright license=MIT
-license jquery.isonscreen.copyright license=MIT
+# the packaging software treats the license= attribute as the key, so
+# we need to name them differently or the tools will fail to deal with
+# the fact that they are really different license files.
+license jquery.copyright license=MIT-1
+license jquery.isonscreen.copyright license=MIT-2
 
 dir path=usr
 dir path=usr/bin

--- a/tools/userland-mangler	Wed Aug 03 01:08:07 2011 -0700
+++ b/tools/userland-mangler	Wed Aug 03 13:45:11 2011 -0700
@@ -234,7 +234,7 @@
 		for directory in search_paths:
 			if directory != destination:
 				src = os.path.join(directory, path)
-				if os.path.exists(src):
+				if os.path.isfile(src):
 					mangle_path(manifest, action, src, dest)
 					break