hg: jdk7u/jdk7u: 2 new changesets

[lana.steuck at oracle.com]

Changeset: 02ebe49d67ef
Author:    aywang
Date:      2013-05-09 15:45 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/rev/02ebe49d67ef

8014129: makefile changes to allow integration of new features
Reviewed-by: tbell, robilad

! make/hotspot-rules.gmk

Changeset: f89fd7e2800c
Author:    lana
Date:      2013-05-10 10:13 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/rev/f89fd7e2800c

Merge