1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ca9b0dc93..773be8af70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec  7 09:29:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/weakref.rb (WeakRef::__setobj__): should support
+	  marshaling.  [ruby-talk:228508]
+
+	* lib/delegate.rb (Delegator::marshal_load): need to call
+	  __setobj__.
+
 Wed Dec  6 23:56:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.mk (NULLCMD): moved for platforms that empty