--- a/ProjectDefinition.st	Wed Nov 28 10:22:05 2012 +0000
+++ b/ProjectDefinition.st	Fri Nov 30 17:19:23 2012 +0000
@@ -1069,7 +1069,6 @@
     self classNamesAndAttributes:newSpec usingCompiler:compilerOrNil
 ! !
 
-
 !ProjectDefinition class methodsFor:'accessing - tests'!
 
 excludedFromTestSuite
@@ -5881,10 +5880,15 @@
     ].
     [
 	Class withoutUpdatingChangesDo:[
-	    packagesToLoad do:[:aPackage |
-		(PackagesBeingLoaded includes:aPackage) ifFalse:[
-		    PackagesBeingLoaded add:aPackage.
-		    Smalltalk loadPackage:aPackage asAutoloaded:asAutoloaded.
+            packagesToLoad do:[:eachPackageID |
+                |cls|
+
+                cls := ProjectDefinition definitionClassForPackage:eachPackageID.
+                (cls isNil or:[cls projectIsLoaded not]) ifTrue:[                        
+                    (PackagesBeingLoaded includes:eachPackageID) ifFalse:[
+                        PackagesBeingLoaded add:eachPackageID.
+                        Smalltalk loadPackage:eachPackageID asAutoloaded:asAutoloaded.
+                    ]
 		]
 	    ].
 	].
@@ -6104,13 +6108,13 @@
 	    self
 		addReferencesToClassesFromGlobalsInMethods:
 		    (aClass theNonMetaclass methodDictionary values
-			select:[:m | m package = aClass package])
+                        select:[:m | m isExtension not])
 		to:usedClassReasons.
 
 	    self
 		addReferencesToClassesFromGlobalsInMethods:
 		    (aClass theMetaclass methodDictionary values
-			select:[:m | m package = aClass package])
+                        select:[:m | m isExtension not])
 		to:usedClassReasons.
 	].
 
@@ -6650,7 +6654,7 @@
      called before checking in build support files"
 
     |emptyProjects nonProjects emptyOrNonProjects classesInImage
-     classesInDescription onlyInImage onlyInDescription missingPools|
+     classesInDescription onlyInImage onlyInDescription missingPools myPackage|
 
     emptyProjects := Set withAll:self subProjects.
     Smalltalk allClassesDo:[:cls |
@@ -6677,7 +6681,8 @@
         ].
     ].
 
-    classesInImage := Smalltalk allClasses select:[:cls | (cls package = self package) and:[cls isPrivate not]].
+    myPackage := self package.
+    classesInImage := Smalltalk allClasses select:[:cls | (cls package == myPackage) and:[cls isPrivate not]].
     "/ classesInDescription := self classes asIdentitySet.
     classesInDescription := IdentitySet new.
     ((self compiled_classNamesForPlatform:(OperatingSystem platformName))
@@ -6926,15 +6931,16 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProjectDefinition.st 10875 2012-11-28 10:22:05Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.397 2012/11/21 16:57:05 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.395 2012/09/26 19:17:12 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.397 2012/11/21 16:57:05 cg Exp '
 !
 
 version_SVN
-    ^ '$Id:: ProjectDefinition.st 10875 2012-11-28 10:22:05Z vranyj1                                                                $'
+    ^ '$Id:: ProjectDefinition.st 10876 2012-11-30 17:19:23Z vranyj1                                                                $'
 ! !
 
 ProjectDefinition initialize!
+