--- a/ProjectDefinition.st	Sun Sep 04 11:13:42 2011 +0200
+++ b/ProjectDefinition.st	Sun Sep 04 11:15:48 2011 +0200
@@ -4489,10 +4489,14 @@
             ].
         ].
 
-        self activityNotification:'Loading extensions'.
-        newStuffHasBeenLoaded := newStuffHasBeenLoaded | meOrMySecondIncarnation loadExtensions.
-        self activityNotification:'Loading classes'.
-        newStuffHasBeenLoaded := newStuffHasBeenLoaded | (meOrMySecondIncarnation loadAllClassesAsAutoloaded:asAutoloaded).
+        self hasAllExtensionsLoaded ifFalse:[
+            self activityNotification:'Loading extensions'.
+            newStuffHasBeenLoaded := newStuffHasBeenLoaded | meOrMySecondIncarnation loadExtensions.
+        ].
+        self hasAllClassesLoaded ifFalse:[
+            self activityNotification:'Loading classes'.
+            newStuffHasBeenLoaded := newStuffHasBeenLoaded | (meOrMySecondIncarnation loadAllClassesAsAutoloaded:asAutoloaded).
+        ].
 "/ no, don't load subProjects here - will lead to a recursion, which leads
 "/ to some classes being loaded from source (soap)
         self activityNotification:'Loading sub projects'.
@@ -4515,7 +4519,7 @@
     "Created: / 17-08-2006 / 01:01:41 / cg"
     "Modified: / 30-10-2008 / 08:16:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-08-2009 / 12:02:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-08-2011 / 17:28:49 / cg"
+    "Modified: / 04-09-2011 / 10:01:53 / cg"
 !
 
 unloadPackage
@@ -6389,11 +6393,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.346 2011-08-21 15:29:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.347 2011-09-04 09:15:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.346 2011-08-21 15:29:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.347 2011-09-04 09:15:48 cg Exp $'
 !
 
 version_SVN