merges r23918 and r23919 from trunk into ruby_1_9_1.

--
* marshal.c (w_encoding): encodings need extra depth.
  [ruby-core:24100]
--
* test/ruby/test_marshal.rb (TestMarshal#test_limit): test for
  [ruby-core:24100].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 11d7ed6f69..de8f58cfc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 08:46:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_encoding): encodings need extra depth.
+	  [ruby-core:24100]
+
 Tue Jun 30 17:44:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (reg_match_pos): adjust offset based on characters, not