hg: jdk7/hotspot-comp/hotspot: 2 new changesets

[tom.rodriguez at oracle.com]

Changeset: 322a41ec766c
Author:    never
Date:      2011-03-25 11:29 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/322a41ec766c

7025708: Assertion if using "-XX:+CITraceTypeFlow -XX:+Verbose" together
Reviewed-by: never
Contributed-by: volker.simonis at gmail.com

! src/share/vm/ci/ciTypeFlow.cpp

Changeset: b2949bf39900
Author:    never
Date:      2011-03-25 18:19 -0400
URL:       http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/b2949bf39900

Merge