--- a/NameSpace.st	Wed Feb 16 16:31:43 2005 +0100
+++ b/NameSpace.st	Thu Feb 17 00:02:09 2005 +0100
@@ -99,7 +99,7 @@
             ].
             thisNamespace isNil ifTrue:[
                 thisNamespace := self name:key
-            ]
+            ].
         ] ifFalse:[
             thisNamespace isNameSpace ifTrue:[
                 x := thisNamespace at:key.
@@ -111,7 +111,11 @@
 
             x isNil ifTrue:[
                 thisNamespace isNameSpace ifTrue:[
-                    x := thisNamespace name:key.
+		    thisNamespace == Smalltalk ifTrue:[
+			x := Smalltalk at:key
+		    ] ifFalse:[
+                        x := thisNamespace name:key.
+		    ]
                 ] ifFalse:[
                     x :=
                         self subclass:key
@@ -125,7 +129,7 @@
                 x setPackage:nil.
             ].
             thisNamespace := x.
-        ]
+        ].
     ].
 
     ^ thisNamespace
@@ -517,5 +521,5 @@
 !NameSpace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.52 2005-02-16 12:29:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.53 2005-02-16 23:02:09 cg Exp $'
 ! !