From bc885aeae60d6e00a4de3852640221c30c685ed1 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 6 Feb 2010 12:32:12 +0000
Subject: [PATCH] added a ChangeLog entry.

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

diff --git a/ChangeLog b/ChangeLog
index e75102c1f3..0cb0d19946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb  6 21:31:23 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb (wait): supported timeout.
+
+	* test/net/imap/test_imap.rb (test_exception_during_idle): use timeout.
+
 Sat Feb  6 19:35:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* tool/compile_prelude.rb: fix require path.