--- a/ChangeSetBrowser.st	Wed Feb 22 18:43:44 2006 +0100
+++ b/ChangeSetBrowser.st	Wed Feb 22 18:49:49 2006 +0100
@@ -694,7 +694,7 @@
                 do:[    
                     Class nameSpaceQuerySignal answer:nameSpace
                     do:[
-                        (changeSet at:changeNr) apply.
+                        self applyPossiblyModifiedChange:(changeSet at:changeNr).
                     ]
                 ]
             ]
@@ -716,6 +716,32 @@
     "Modified: / 7.2.1998 / 19:35:11 / cg"
 !
 
+applyPossiblyModifiedChange:aChange
+    |ns superClass superClassName|
+
+    applyInOriginalNameSpace value ifFalse:[
+        aChange isClassDefinitionChange ifTrue:[
+            superClassName := aChange superClassName.
+
+            ns := Class nameSpaceQuerySignal query.
+            superClass := ns at:superClassName.
+            (superClass isNil and:[ superClass ~~ Smalltalk ]) ifTrue:[
+                superClass := Smalltalk at:superClassName.
+            ].
+            superClass isNil ifTrue:[
+                (superClassName includes:$:) ifFalse:[
+                    superClass := ns at:superClassName.
+                ].
+            ].
+            superClass notNil ifTrue:[
+                aChange superClassName:superClass name.
+            ]
+        ].
+    ].
+
+    aChange apply.
+!
+
 changeIsFollowupMethodChange:changeNr
     ^ false
 
@@ -953,5 +979,5 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.40 2005-05-11 09:27:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.41 2006-02-22 17:49:49 cg Exp $'
 ! !