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

[Christian.Thalinger at Sun.COM]

Changeset: a9584793da0f
Author:    twisti
Date:      2010-04-15 03:13 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/a9584793da0f

6944028: 6940701 broke Zero
Summary: The fix for 6940701 broke Zero.
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson at redhat.com>

! src/cpu/zero/vm/globals_zero.hpp

Changeset: d32d2a2f62cd
Author:    twisti
Date:      2010-04-16 02:59 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/d32d2a2f62cd

Merge