# HG changeset patch
# User lana
# Date 1366218762 25200
# Node ID 6c560f9ebb3e5894adedd1a082e37eaebb84684f
# Parent  124ca22437b147526b7d42a264184cebb6284d01# Parent  5201379fe48713a26b46b89c9fd3e4c9210a5e85
Merge

diff -r 5201379fe487 -r 6c560f9ebb3e src/share/vm/opto/library_call.cpp