git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r24785 and r24833 from trunk into ruby_1_9_1, with small modification.¶
see [ruby-dev:39249].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e