merges r22900 from trunk into ruby_1_9_1.

--
* process.c (rb_f_sleep): time() needs time_t.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 99f784ece5..584cca5c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 12 05:16:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_f_sleep): time() needs time_t.
+
 Thu Mar 12 05:12:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread_pthread.c (ruby_init_stack): range of rlim_cur may be