git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r24757 and r24758 from trunk into ruby_1_9_1.¶
[ruby-dev:39163] (#1996), [ruby-core:25143]
--
[ruby-dev:39163] (#1996), [ruby-core:25143]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e