merges r20476 and r20479 from trunk into ruby_1_9_1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r20476 and r20479 from trunk into ruby_1_9_1.
'parent' and 'variable' options on a Hash argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e