hg: jdk7/jdk7/hotspot: 2 new changesets

[michael.wilkerson at oracle.com]

Changeset: e13a5c0ed5e2
Author:    prr
Date:      2010-06-29 16:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/e13a5c0ed5e2

6964882: 32 bit JDK does not build on 64 bit Windows platforms
Reviewed-by: ohair, valeriep

! make/windows/makefiles/defs.make

Changeset: ad1977f08c4d
Author:    mikejwre
Date:      2010-06-30 18:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ad1977f08c4d

Merge