diff --git a/ChangeLog b/ChangeLog
index 4571e907d..d43e16cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-14 00:40-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSScrollView.m: Correct issue with tableviews when
+	loading nib files, corrected bug #24782.
+
 2008-11-13 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSView.m (-setBounds:, -setBoundsSize:, -setFrame:,
@@ -67,7 +72,6 @@
 	* Source/NSPopUpButton.m (-keyDown): Trigger action only after
 	pressing the Space key.
 
->>>>>>> .r27016
 2008-11-01 21:35-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/NSWindow.m: Reverted a previous change to miniaturize.
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index 1e9aff61b..54c8236c5 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -1519,7 +1519,9 @@ static float scrollerWidth;
               [content setFrame: frame];
             }
 
+          // reset the content view...
           [self setContentView: content];
+          _contentView = content;
         }
      
       if (hScroller != nil && _hasHorizScroller)