hg: jdk7/tl/jdk: 2 new changesets

[sean.mullan at oracle.com]

Changeset: a21c46dac6cf
Author:    mullan
Date:      2010-08-03 09:39 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a21c46dac6cf

6653372: Error in java.security.KeyStore example code
Reviewed-by: weijun

! src/share/classes/java/security/KeyStore.java

Changeset: 2feeefb45a44
Author:    mullan
Date:      2010-08-03 09:55 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2feeefb45a44

Merge