diff --git a/build/mac/BuildList.pm b/build/mac/BuildList.pm
index ffd53d221db1..e32689c5ad3b 100644
--- a/build/mac/BuildList.pm
+++ b/build/mac/BuildList.pm
@@ -53,90 +53,91 @@ sub BuildMozilla()
 			# Build the appropriate target of each project
 			#
 
-		BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",										"Stubs");
-		BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",									"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",							"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",						"Stubs");
 		BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stubs");
-		BuildProjectClean(":mozilla:cmd:macfe:projects:client:NavigatorStubs.mcp",		"Stubs");
+		BuildProjectClean(":mozilla:cmd:macfe:projects:client:NavigatorStubs.mcp",			"Stubs");
 		
-		BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",											"NSRuntime$D.shlb");
+		BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",							"NSRuntime$D.shlb");
 		MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:cmd:macfe:restext:StringLib.mcp",											"Strings$D.shlb");
+		BuildProject(":mozilla:cmd:macfe:restext:StringLib.mcp",							"Strings$D.shlb");
 		MakeAlias(":mozilla:cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp",							"MoreFiles$D.shlb");
+		BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp",					"MoreFiles$D.shlb");
 		MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",												"NSPR20$D.shlb");
+		BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",								"NSPR20$D.shlb");
 		MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp",															"DBM$D.shlb");
+		BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp",									"DBM$D.shlb");
 		MakeAlias(":mozilla:dbm:macbuild:DBM$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",					"MemAllocator$D.shlb");
+		BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"MemAllocator$D.shlb");
 		MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",												"NSStdLib$D.shlb");
+		BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
 		MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",													"xpcom$D.shlb");
+		BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.shlb");
 		MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",										"PowerPlant$D.shlb");		
+		BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",							"PowerPlant$D.shlb");		
 		MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",												"zlib$D.shlb");
+		BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",								"zlib$D.shlb");
 		MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",																"JPEG$D.shlb");
+		BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",										"JPEG$D.shlb");
 		MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",								"JavaRuntime$D.shlb");
+		BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",						"JavaRuntime$D.shlb");
 		MakeAlias(":mozilla:sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");	
 		
-		BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp", 													"JSJ$D.o");
+		BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp", 								"JSJ$D.o");
 		
-		BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",												"JavaScript$D.shlb");
+		BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",								"JavaScript$D.shlb");
 		MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",							"NavJava$D.shlb");
+		BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",					"NavJava$D.shlb");
 		MakeAlias(":mozilla:nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
 
-		BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", 												"RDF$D.shlb");
+		BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", 								"RDF$D.shlb");
 		MakeAlias(":mozilla:modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
 	
-		BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",													"XML$D.shlb");
+		BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",								"XML$D.shlb");
 		MakeAlias(":mozilla:modules:xml:macbuild:XML$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",								"Scheduler$D.shlb");
+		BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",						"Scheduler$D.shlb");
 		MakeAlias(":mozilla:modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
 			
-		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",										"CustomLib$D.shlb");
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomLib$D.shlb");
 		MakeAlias(":mozilla:build:mac:CustomLib:CustomLib$D.shlb", "$dist_dir");
 		
-		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",										"CustomStaticLibs$D.o");
 		BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",			"Security.o");
-		BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",							"FontBroker$D.o");
-		BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp",										"LibMocha$D.o");	
-		BuildProject(":mozilla:network:macbuild:network.mcp",													"Network$D.o");
+		BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",					"FontBroker$D.o");
+		BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp",							"LibMocha$D.o");	
+		BuildProject(":mozilla:network:macbuild:network.mcp",								"Network$D.o");
+
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomStaticLibs$D.o");
 		
 		if ( $main::MOZ_LITE == 0 )
 			{
-				BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",						"Composer$D.o");
+				BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",				"Composer$D.o");
 				
 				# Build the appropriate resources target
-				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Moz_Resources");
+				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 				"Moz_Resources");
 			}
 		else
 			{
 				# Build a project with dummy targets to make stub libraries
-				BuildProject("cmd:macfe:projects:dummies:MakeDummies.mcp",				"Composer$D.o");
+				BuildProject("cmd:macfe:projects:dummies:MakeDummies.mcp",					"Composer$D.o");
 				
 				# Build the appropriate resources target
-				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Nav_Resources");
+				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 				"Nav_Resources");
 			}
 		
-		BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 								"Client$D");
+		BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Client$D");
 	}
 
 
@@ -145,96 +146,96 @@ sub DistMozilla()
 		mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
 
 		#INCLUDE
-		InstallFromManifest(":mozilla:config:mac:MANIFEST",													":mozilla:dist:config:");
-		InstallFromManifest(":mozilla:include:MANIFEST",														":mozilla:dist:include:");
-		InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST",											":mozilla:dist:include:");
+		InstallFromManifest(":mozilla:config:mac:MANIFEST",								":mozilla:dist:config:");
+		InstallFromManifest(":mozilla:include:MANIFEST",								":mozilla:dist:include:");
+		InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST",							":mozilla:dist:include:");
 
 		#MAC_COMMON
-		InstallFromManifest(":mozilla:build:mac:MANIFEST",													":mozilla:dist:mac:common:");
-		InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST",						":mozilla:dist:mac:common:");
-		InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST",	":mozilla:dist:mac:common:");
-		InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST",												":mozilla:dist:mac:common:");
-		InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST",									":mozilla:dist:mac:common:morefiles:");
-		InstallFromManifest(":mozilla:cmd:macfe:MANIFEST",													":mozilla:dist:mac:macfe:");
+		InstallFromManifest(":mozilla:build:mac:MANIFEST",								":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST",				":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST",		":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST",							":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST",						":mozilla:dist:mac:common:morefiles:");
+		InstallFromManifest(":mozilla:cmd:macfe:MANIFEST",								":mozilla:dist:mac:macfe:");
 
 		#NSPR
-		InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST",									":mozilla:dist:nspr:");
-		InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST",							":mozilla:dist:nspr:mac:");
-		InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST",											":mozilla:dist:nspr:");
-		InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST",						":mozilla:dist:nspr:");
-		InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST",						":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST",						":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST",					":mozilla:dist:nspr:mac:");
+		InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST",							":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST",				":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST",				":mozilla:dist:nspr:");
 		
 		#DBM
-		InstallFromManifest(":mozilla:dbm:include:MANIFEST",												":mozilla:dist:dbm:");
+		InstallFromManifest(":mozilla:dbm:include:MANIFEST",							":mozilla:dist:dbm:");
 		
 		#LIBIMAGE
-		InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST",									":mozilla:dist:libimg:");
-		InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST",									":mozilla:dist:libimg:");
-		InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST",							":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST",					":mozilla:dist:libimg:");
 		
 		#SECURITY_freenav
-		InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST",		":mozilla:dist:security:");
+		InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST",				":mozilla:dist:security:");
 		
 		#XPCOM
-		InstallFromManifest(":mozilla:xpcom:src:MANIFEST",									":mozilla:dist:xpcom:");
+		InstallFromManifest(":mozilla:xpcom:src:MANIFEST",								":mozilla:dist:xpcom:");
 		
 		#ZLIB
 		InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST",						":mozilla:dist:zlib:");
 				
 		#JPEG
-		InstallFromManifest(":mozilla:jpeg:MANIFEST",												":mozilla:dist:jpeg:");
+		InstallFromManifest(":mozilla:jpeg:MANIFEST",									":mozilla:dist:jpeg:");
 		
 		#JSJ
-		InstallFromManifest(":mozilla:js:jsj:MANIFEST",											":mozilla:dist:jsj:");
+		InstallFromManifest(":mozilla:js:jsj:MANIFEST",									":mozilla:dist:jsj:");
 		
 		#JSDEBUG
-		InstallFromManifest(":mozilla:js:jsd:MANIFEST",											":mozilla:dist:jsdebug:");
+		InstallFromManifest(":mozilla:js:jsd:MANIFEST",									":mozilla:dist:jsdebug:");
 		
 		#JS
-		InstallFromManifest(":mozilla:js:src:MANIFEST",											":mozilla:dist:js:");
+		InstallFromManifest(":mozilla:js:src:MANIFEST",									":mozilla:dist:js:");
 		
 		#RDF
-		InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST",				":mozilla:dist:rdf:");
+		InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST",					":mozilla:dist:rdf:");
 		
 		#XML
 		InstallFromManifest(":mozilla:modules:xml:glue:MANIFEST",						":mozilla:dist:xml:");
-		InstallFromManifest(":mozilla:modules:xml:expat:xmlparse:MANIFEST",	":mozilla:dist:xml:");
+		InstallFromManifest(":mozilla:modules:xml:expat:xmlparse:MANIFEST",				":mozilla:dist:xml:");
 		
 		#LIBFONT
 		InstallFromManifest(":mozilla:modules:libfont:MANIFEST",						":mozilla:dist:libfont:");
-		InstallFromManifest(":mozilla:modules:libfont:src:MANIFEST",				":mozilla:dist:libfont:");
+		InstallFromManifest(":mozilla:modules:libfont:src:MANIFEST",					":mozilla:dist:libfont:");
 		
 		#LDAP
 		if ( $main::MOZ_LDAP )
 			{
-				InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST", ":mozilla:dist:ldap:");
+				InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",	":mozilla:dist:ldap:");
 			}
 			
 		#SCHEDULER
-		InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST",		":mozilla:dist:schedulr:");
+		InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST",				":mozilla:dist:schedulr:");
 		
 		#NETWORK
-		InstallFromManifest(":mozilla:network:cache:MANIFEST",						":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:client:MANIFEST",						":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:cnvts:MANIFEST",						":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:cstream:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cache:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:client:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cnvts:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cstream:MANIFEST",						":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:main:MANIFEST",							":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:mimetype:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:mimetype:MANIFEST",						":mozilla:dist:network:");
 		InstallFromManifest(":mozilla:network:util:MANIFEST",							":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:about:MANIFEST",		":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:file:MANIFEST",		":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST",			":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:http:MANIFEST",		":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:js:MANIFEST",			":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST",		":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST",		":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST",	":mozilla:dist:network:");
-		InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST",		":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:about:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:file:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:http:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:js:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST",					":mozilla:dist:network:");
 		
 		#HTML_DIALOGS
 		InstallFromManifest(":mozilla:lib:htmldlgs:MANIFEST",							":mozilla:dist:htmldlgs:");
@@ -243,7 +244,7 @@ sub DistMozilla()
 		InstallFromManifest(":mozilla:lib:layout:MANIFEST",								":mozilla:dist:layout:");
 		
 		#LAYERS
-		InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST",			":mozilla:dist:layers:");
+		InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST",					":mozilla:dist:layers:");
 		
 		#PARSE
 		InstallFromManifest(":mozilla:lib:libparse:MANIFEST",							":mozilla:dist:libparse:");
@@ -255,30 +256,30 @@ sub DistMozilla()
 		InstallFromManifest(":mozilla:lib:plugin:MANIFEST",								":mozilla:dist:plugin:");
 		
 		#LIBHOOK
-		InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST",		":mozilla:dist:libhook:");
+		InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST",					":mozilla:dist:libhook:");
 		
 		#LIBPREF
-		InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST",		":mozilla:dist:libpref:");
+		InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST",					":mozilla:dist:libpref:");
 		
 		#LIBREG
-		InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",		":mozilla:dist:libreg:");
+		InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",					":mozilla:dist:libreg:");
 		
 		#LIBUTIL
-		InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST",		":mozilla:dist:libutil:");
+		InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST",					":mozilla:dist:libutil:");
 		
 		#PROGRESS
-		InstallFromManifest(":mozilla:modules:progress:public:MANIFEST",	":mozilla:dist:progress:");
+		InstallFromManifest(":mozilla:modules:progress:public:MANIFEST",				":mozilla:dist:progress:");
 		
 		#EDTPLUG
-		InstallFromManifest(":mozilla:modules:edtplug:include:MANIFEST", 	":mozilla:dist:edtplug:");
+		InstallFromManifest(":mozilla:modules:edtplug:include:MANIFEST", 				":mozilla:dist:edtplug:");
 
 		#NAV_JAVA
-		InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST",		":mozilla:dist:nav-java:");
-		InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST",		":mozilla:dist:nav-java:");
+		InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST",					":mozilla:dist:nav-java:");
+		InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST",					":mozilla:dist:nav-java:");
 		
 		#SUN_JAVA
-		InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST",		":mozilla:dist:sun-java:");
-		InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST",		":mozilla:dist:sun-java:");
+		InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST",					":mozilla:dist:sun-java:");
+		InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST",					":mozilla:dist:sun-java:");
 	}
 
 1;