Conflicts:
ext/psych/psych.gemspec
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Conflicts:
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e