git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r26626 and r26627 from trunk into ruby_1_9_1. This fixes #3159.¶
[ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
--
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e