merges r24659 from trunk into ruby_1_9_1.

--
* vm.c (collect_local_variables_in_env): skips internal variables.
  [ruby-core:25125]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6fe33daef..80df23811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 26 12:36:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (collect_local_variables_in_env): skips internal variables.
+	  [ruby-core:25125]
+
 Mon Aug 24 16:35:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* st.c (st_delete_safe): deals with packed entries.