hg: jdk7/tl/jdk: 2 new changesets

[mike.duigou at oracle.com]

Changeset: 7c9780ea0c5a
Author:    mduigou
Date:      2011-05-03 16:32 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7c9780ea0c5a

7041612: Rename StandardCharset to StandardCharsets
Reviewed-by: alanb, mr, darcy

! make/java/nio/FILES_java.gmk
! src/share/classes/java/nio/charset/Charset.java
- src/share/classes/java/nio/charset/StandardCharset.java
+ src/share/classes/java/nio/charset/StandardCharsets.java
! src/share/classes/java/nio/file/Path.java
! src/share/classes/java/util/zip/ZipCoder.java
! src/share/classes/java/util/zip/ZipFile.java
! src/share/classes/java/util/zip/ZipInputStream.java
! src/share/classes/java/util/zip/ZipOutputStream.java
! src/share/classes/sun/awt/FontDescriptor.java

Changeset: 5dceeea3bb99
Author:    mduigou
Date:      2011-05-09 08:58 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5dceeea3bb99

Merge