--- a/Project.st	Sat Jan 22 18:52:46 2000 +0100
+++ b/Project.st	Sat Jan 22 21:27:51 2000 +0100
@@ -1225,6 +1225,8 @@
     "/    full-name-of-class
     "/    condition (optional)  - #unix / #win32 / #vms / #macos / #always / #never / #autoload
     "/    fileName (optional)
+    properties at:#autoIncludeImageClasses put:false.
+
     (pack at:'classes' default:#()) do:[:info |
         |condKey className optionalFileName|
 
@@ -3105,17 +3107,21 @@
         ]
     ].
 
-    classes isNil ifTrue:[
-        classes := OrderedCollection new.
-        Smalltalk 
-            allClassesDo:[:aClass |
-                (true "aClass owningClass isNil"
-                and:[aClass isMeta not
-                and:[aClass package = packageName
-                and:[aClass isNamespace not or:[aClass == Smalltalk]]]]) ifTrue:[
-                    classes add:aClass
-                ]
-            ].
+    (properties isNil
+    or:[properties at:#autoIncludeImageClasses ifAbsent:true])
+    ifTrue:[
+        classes isNil ifTrue:[
+            classes := OrderedCollection new.
+            Smalltalk 
+                allClassesDo:[:aClass |
+                    (true "aClass owningClass isNil"
+                    and:[aClass isMeta not
+                    and:[aClass package = packageName
+                    and:[aClass isNamespace not or:[aClass == Smalltalk]]]]) ifTrue:[
+                        classes add:aClass
+                    ]
+                ].
+        ].
     ].
     ^ classes ? #()
 
@@ -3579,6 +3585,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.145 2000-01-22 17:52:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.146 2000-01-22 20:27:51 cg Exp $'
 ! !
 Project initialize!