--- a/ProjectDefinition.st	Thu Dec 13 15:27:28 2012 +0100
+++ b/ProjectDefinition.st	Thu Dec 13 15:29:36 2012 +0100
@@ -19,8 +19,7 @@
 	category:'System-Support-Projects'
 !
 
-ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded
-	loadDirectory'
+ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded'
 
 "
  No other class instance variables are inherited by this class.
@@ -468,13 +467,13 @@
     "if I was loaded from a directory (as oposed to loaded via a dll or from a scm),
      return that directory. Otherwise return nil."
 
-    ^ loadDirectory
+    ^ self getAttribute:#loadDirectory
 !
 
 loadDirectory:aDirectory
     "remember the directory from which I was loaded from"
 
-    loadDirectory := aDirectory
+    self setAttribute:#loadDirectory to:aDirectory
 !
 
 module
@@ -638,7 +637,9 @@
      return that directory. 
      Otherwise ask Smalltalk for my package directory a long the package path."
 
-    loadDirectory notNil ifTrue:[ ^ loadDirectory ].
+    |loadDirectory|
+
+    (loadDirectory := self loadDirectory notNil) ifTrue:[ ^ loadDirectory ].
     ^ Smalltalk packageDirectoryForPackageId: self package
 
     "Created: / 15-06-2009 / 12:01:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -6740,11 +6741,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.399 2012-12-13 14:17:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.400 2012-12-13 14:29:36 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.399 2012-12-13 14:17:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.400 2012-12-13 14:29:36 cg Exp $'
 !
 
 version_SVN