From 92d814a81bc23945972aa32a2f0ef55bbe7f27bf Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Nov 2008 12:12:50 +0000
Subject: merges r20276 and r20278 from trunk into ruby_1_9_1. fixed fails
 occasionally [ruby-dev:37119]. thanks, shinichiro.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 815cb8afcb..189022954f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 03:01:04 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
+	  thanks, shinichiro.h.
+
 Wed Nov 19 02:39:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (Init_syserr): moved function definition itself from
@@ -1100,7 +1105,7 @@ Wed Oct 22 05:39:39 2008  Koichi Sasada  <ko1@atdot.net>
 
 Wed Oct 22 00:29:13 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* test/rinda/test_rinda.c (test_core_03_notify): Fixed test failures
+	* test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
 	  [ruby-dev:36837].
 
 Wed Oct 22 00:22:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-- 
cgit v1.2.3