--- a/ChangeSet.st	Fri Nov 10 17:25:23 2006 +0100
+++ b/ChangeSet.st	Fri Nov 10 17:25:38 2006 +0100
@@ -601,7 +601,7 @@
             chg notNil ifTrue:[
                 cls := chg changeClass.
                 cls notNil ifTrue:[
-                    cls isNameSpace ifFalse:[
+                    cls isRealNameSpace ifFalse:[
                         classes add:cls
                     ]
                 ]
@@ -616,7 +616,7 @@
      ChangeSet current flushChangedClassesCache
     "
 
-    "Modified: / 14-09-2006 / 16:04:18 / cg"
+    "Modified: / 10-11-2006 / 17:17:26 / cg"
 !
 
 component:component definition:anObject change:changeSymbol
@@ -900,7 +900,10 @@
 !ChangeSet methodsFor:'private-accessing'!
 
 addChange:aChange
-    aChange timeStamp:(Timestamp now).
+    aChange timeOfChangeIfKnown isNil ifTrue:[
+        aChange timeStamp:(Timestamp now).
+    ].
+
     self add:aChange.
     changedClasses notNil ifTrue:[
         changedClasses add:aChange changeClass.
@@ -914,8 +917,8 @@
 "/    aChange sendChangeNotificationThroughSmalltalk. 
     self changed:#addChange: with:aChange.
 
-    "Created: / 14.11.2001 / 13:35:11 / cg"
-    "Modified: / 14.11.2001 / 13:36:58 / cg"
+    "Created: / 14-11-2001 / 13:35:11 / cg"
+    "Modified: / 10-11-2006 / 16:47:13 / cg"
 !
 
 flushChangedClassesCache
@@ -2278,5 +2281,5 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.145 2006-10-25 16:09:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.146 2006-11-10 16:25:38 cg Exp $'
 ! !