git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r25405 from trunk into ruby_1_9_1. fixes the backport task #2233.¶
[ruby-core:26169]. [ruby-core:26165]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e