merges r23474 from trunk into ruby_1_9_1.

--
* compile.c (rb_parse_in_eval): returns true in true eval, not in
  main.  [ruby-dev:38382]

* parse.y (program): inherits dvars in eval or main.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index caa329f4c1..8057aefb56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 17 14:23:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (rb_parse_in_eval): returns true in true eval, not in
+	  main.  [ruby-dev:38382]
+
+	* parse.y (program): inherits dvars in eval or main.
+
 Sun May 17 13:15:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm.c (rb_vm_get_sourceline): should not access out of bound.