git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r24403 and r24439 from trunk into ruby_1_9_1.¶
[ruby-core:24767]
--
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e