merges r29885 from trunk into ruby_1_9_2.

--
* vm.c (rb_thread_mark): should mark self in conrol
  frames.  [ruby-core:33289]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 92d6546ed4..5ac65dc128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): should mark self in conrol
+	  frames.  [ruby-core:33289]
+
 Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@atdot.net>
 
 	* iseq.c (iseq_s_compile): fix optional argument.