--- a/Class.st	Mon Jul 06 06:06:17 2015 +0100
+++ b/Class.st	Tue Jul 07 06:36:18 2015 +0200
@@ -1494,7 +1494,8 @@
 !
 
 projectDefinitionClass
-    "return the project definition of the classes package"
+    "return the project definition of the classes' package.
+     Eg. for Array, this would return the stx_libbasic project definition class."
 
     ^ ProjectDefinition definitionClassForPackage: self package
 
@@ -1969,7 +1970,6 @@
     "Created: / 18-07-2011 / 09:14:38 / cg"
 ! !
 
-
 !Class methodsFor:'adding & removing'!
 
 removeFromSystem
@@ -5779,11 +5779,11 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.656 2015-04-10 14:22:21 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.656 2015-04-10 14:22:21 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN

--- a/PackageId.st	Mon Jul 06 06:06:17 2015 +0100
+++ b/PackageId.st	Tue Jul 07 06:36:18 2015 +0200
@@ -333,6 +333,9 @@
 !
 
 projectDefinitionClass
+    "return the project definition for this package.
+     Eg. for 'stx:libbasic', this would return the stx_libbasic project definition class."
+
     ^ ProjectDefinition definitionClassForPackage:self
 
     "

--- a/Smalltalk.st	Mon Jul 06 06:06:17 2015 +0100
+++ b/Smalltalk.st	Tue Jul 07 06:36:18 2015 +0200
@@ -6335,17 +6335,21 @@
 !
 
 fileInSourceFile:filenameArg lazy:loadLazy silent:beSilent
-    "Try all available programming languages"
+    "Try all available programming languages for a matching suffix"
 
     |filename|
 
     filename := filenameArg asFilename.
-    ProgrammingLanguage allDo:[:lang| | f |
-	f := (filename hasSuffix:lang sourceFileSuffix)
-		    ifTrue:[filename]
-		    ifFalse:[filename addSuffix:lang sourceFileSuffix].
-	(self fileIn:f lazy:loadLazy silent:beSilent)
-		ifTrue:[^ true]
+    ProgrammingLanguage allDo:[:lang| 
+        | f |
+
+        "/ cg: changed: did try all languages to load (eg. wether suffix matched or not.
+        "/ I don't think, that is a good idea, as all of them languages might start parsing...
+        (filename hasSuffix:lang sourceFileSuffix) ifTrue:[
+            (self fileIn:f lazy:loadLazy silent:beSilent) ifTrue:[
+                ^ true
+            ].
+        ]
     ].
     ^ false
 
@@ -8288,11 +8292,11 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1133 2015-05-22 18:41:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1133 2015-05-22 18:41:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG

--- a/UserPreferences.st	Mon Jul 06 06:06:17 2015 +0100
+++ b/UserPreferences.st	Tue Jul 07 06:36:18 2015 +0200
@@ -4039,6 +4039,8 @@
     Smalltalk loadPackage:packageName.
 
     "
+     UserPreferences current preloadedPackages
+
      UserPreferences current addPreloadedPackage:'stx:goodies/smallsense'
      UserPreferences current removePreloadedPackage:'stx:goodies/smallsense'
     "
@@ -4080,9 +4082,16 @@
     "remove this from the set of preloaded packages.
      This will be no longer be automatically loaded whenever the system starts"
 
-    (self at:#preloadedPackages ifAbsentPut:[Set new]) remove:packageName ifAbsent:[]
-
-    "
+    |preloaded|
+
+    preloaded := self at:#preloadedPackages ifAbsent:[nil].
+    preloaded notNil ifTrue:[
+        preloaded remove:packageName ifAbsent:[]
+    ].
+
+    "
+     UserPreferences current preloadedPackages
+
      UserPreferences current addPreloadedPackage:'stx:goodies/smallsense'
      UserPreferences current removePreloadedPackage:'stx:goodies/smallsense'
     "