From 0a58a564c97cf75dba893ac9c7f9483a7f696985 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Aug 2012 06:46:31 +0000
Subject: [PATCH] update ChangeLog.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c72e0c02da..180a8b41db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 Wed Aug 22 15:27:50 2012  Koichi Sasada  <ko1@atdot.net>
 
-	* vm_insnhelper.c (vm_setup_method): fix last commit.
-	  [ruby-dev:46065] [Bug #6901]
+	* vm_insnhelper.c (vm_setup_method): fix last commit of
+	  vm_insnhelper.c (r36771). [ruby-dev:46065] [Bug #6901]
+	  Should not disable tail call opt on FINISH_FRMAE.
+	  This flag should be propagated correctly.
 
 Wed Aug 22 14:05:23 2012  Koichi Sasada  <ko1@atdot.net>