hg: jdk7/jdk7/jdk: 2 new changesets

[michael.wilkerson at oracle.com]

Changeset: 861213cb02c3
Author:    prr
Date:      2010-06-29 16:34 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/861213cb02c3

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

! make/sun/security/mscapi/Makefile
! make/sun/security/pkcs11/Makefile

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

Merge