merges r23932 from trunk into ruby_1_9_1.

--
* parse.y (parser_yylex): fixed wrong variable.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index fdab490812..2ecbcf73d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul  2 07:53:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fixed wrong variable.
+
 Tue Jun 30 18:19:07 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_hash): documentation fix.  a patch from