Backport #4357: Please backport r30629 and r30630 to 1_9_2
http://redmine.ruby-lang.org/issues/show/4357

Author: Aaron Patterson
Status: Open, Priority: Normal

A bug was reported with the way Psych handles merge keys in [ruby-core:34679].  These two commits fix merge key handling in Psych.


----------------------------------------
http://redmine.ruby-lang.org