hg: hsx/hotspot-rt/hotspot: 2 new changesets

[david.holmes at oracle.com]

Changeset: 205dd30230e1
Author:    shade
Date:      2013-05-17 01:43 +0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/205dd30230e1

8012939: @Contended doesn't work correctly with inheritance
Summary: Fix instance_size miscalculation.
Reviewed-by: jrose, kvn

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/contended/Inheritance1.java

Changeset: b334821dad92
Author:    dholmes
Date:      2013-05-16 21:19 -0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/b334821dad92

Merge