git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r31389 and r31398 from trunk into ruby_1_9_2.¶
the patch was written by Eric Wong. [Feature #4531]
--
fix commit mistake of r31389.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e