hg: jdk7/tl/jdk: 2 new changesets

[mike.duigou at oracle.com]

Changeset: 5b05f8d1c0e5
Author:    mduigou
Date:      2011-04-26 14:25 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5b05f8d1c0e5

4884238: Adds java.nio.charset.StandardCharset to provide static final constants for the standard charsets.
Reviewed-by: alanb, sherman, darcy

! src/share/classes/java/nio/charset/Charset.java
+ src/share/classes/java/nio/charset/StandardCharset.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
+ test/java/nio/charset/StandardCharset/Standard.java

Changeset: bf2a12c1ffe3
Author:    mduigou
Date:      2011-04-27 14:18 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/bf2a12c1ffe3

Merge