merges r22610 from trunk into ruby_1_9_1.

--
* io.c (rb_io_getline_1): enables limit even if rs is given.
  [ruby-core:22434]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6761aa400..2586326af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 25 12:06:09 2009    <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline_1): enables limit even if rs is given.
+	  [ruby-core:22434]
+
 Wed Feb 25 02:28:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_chomp_bang): coderange may change.