Merged r35411 from trunk:
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merged r35411 from trunk:
conflict with ca-bundle.pem
ditto.
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e