merges r25180 from trunk into ruby_1_9_1.

--
* thread.c (ruby_suppress_tracing): get rid of clobbering by
  longjmp.

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9dd65f7ddc..721ae0e27b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct  2 15:34:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): get rid of clobbering by
+	  longjmp.
+
 Fri Oct 16 12:03:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io