merges r20746 from trunk into ruby_1_9_1.

* id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
  [ruby-dev:37436]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b4d4d9d1ab..832c38002d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 15 15:13:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
+	  [ruby-dev:37436]
+
 Mon Dec 15 15:02:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.