hg: jdk7/hotspot/hotspot: 2 new changesets

[john.coomes at oracle.com]

Changeset: 2b27ef5c2173
Author:    kvn
Date:      2011-05-20 12:46 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/2b27ef5c2173

7046096: SEGV IN C2 WITH 6U25
Summary: Missing fail flag set in strings concatenation code.
Reviewed-by: never

! src/share/vm/opto/stringopts.cpp

Changeset: cfbca4d74a61
Author:    jcoomes
Date:      2011-05-20 22:27 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/cfbca4d74a61

Merge