diff --git a/ChangeLog b/ChangeLog
index b4fc7966fb..3b9ea85fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Apr  2 22:28:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr  3 00:03:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
 
 	* lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
 	  source directory.
diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
index c3029bfe9b..321aaee57d 100644
--- a/lib/rdoc/class_module.rb
+++ b/lib/rdoc/class_module.rb
@@ -145,12 +145,13 @@ class RDoc::ClassModule < RDoc::Context
   # Merges +class_module+ into this ClassModule
 
   def merge class_module
-    if class_module.comment then
+    comment = class_module.comment
+    if comment then
       document = parse @comment
 
-      class_module.comment.parts.push(*document.parts)
+      comment.parts.concat(document.parts)
 
-      @comment = class_module.comment
+      @comment = comment
     end
 
     class_module.each_attribute do |attr|