git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r31344 and r31345 from trunk into ruby_1_9_2.¶
--
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e