Merge eacb6564c05ff7428bcbb3c34f72655b1b5d6ca3.
[Backport #6304]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge eacb6564c05ff7428bcbb3c34f72655b1b5d6ca3.
[Backport #6304]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e