merges r21415 and r21417 from trunk into ruby_1_9_1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r21415 and r21417 from trunk into ruby_1_9_1.
"ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e