hg: jdk7/tl/jdk: 2 new changesets

[michael.x.mcmahon at oracle.com]

Changeset: 60b4039f60f9
Author:    michaelm
Date:      2011-05-02 20:11 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/60b4039f60f9

7041044: InetAddress.getByName(String,InetAddress) added in error
Reviewed-by: alanb

! src/share/classes/java/net/InetAddress.java
! src/share/classes/java/net/Socket.java
! src/share/classes/java/net/SocketPermission.java
! src/share/classes/sun/net/www/URLConnection.java
! src/share/classes/sun/net/www/http/HttpClient.java

Changeset: 36724da65fef
Author:    michaelm
Date:      2011-05-02 20:17 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/36724da65fef

Merge