hg: jdk7u/jdk7u-osx/jdk: 2 new changesets

[michael.x.mcmahon at oracle.com]

Changeset: 3802c2440dd2
Author:    michaelm
Date:      2012-02-01 01:35 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-osx/jdk/rev/3802c2440dd2

7141071: TEST_BUG: update shell scripts in java/nio/charset to detect Mac OS as a valid platform
Reviewed-by: alanb, michaelm

! test/java/nio/charset/coders/CheckSJISMappingProp.sh
! test/java/nio/charset/spi/basic.sh

Changeset: 25c4d6676efa
Author:    michaelm
Date:      2012-02-01 01:37 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-osx/jdk/rev/25c4d6676efa

Merge