hg: jdk7u/jdk7u2-dev/jdk: 2 new changesets

[vincent.x.ryan at oracle.com]

Changeset: 3bf3f68bbe56
Author:    vinnie
Date:      2011-10-14 15:31 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u2-dev/jdk/rev/3bf3f68bbe56

7099228: Use a PKCS11 config attribute to control encoding of an EC point
Reviewed-by: valeriep, mullan

! src/share/classes/sun/security/pkcs11/Config.java
! src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
! src/share/classes/sun/security/pkcs11/P11Key.java
! src/share/classes/sun/security/pkcs11/wrapper/Functions.java
! src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
! src/share/lib/security/sunpkcs11-solaris.cfg

Changeset: 35a7ac263804
Author:    vinnie
Date:      2011-10-14 16:52 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u2-dev/jdk/rev/35a7ac263804

Merge