hg: jdk7u/jdk7u4/jdk: 2 new changesets

[igor.nekrestyanov at oracle.com]

Changeset: ced385dce903
Author:    mfang
Date:      2012-03-12 15:48 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u4/jdk/rev/ced385dce903

7146099: NLS: [de,es,it,ko,pt_BR]launcher_**.properties, double backslash issue.
Reviewed-by: psun

! src/share/classes/sun/launcher/resources/launcher_de.properties
! src/share/classes/sun/launcher/resources/launcher_es.properties
! src/share/classes/sun/launcher/resources/launcher_it.properties
! src/share/classes/sun/launcher/resources/launcher_ko.properties
! src/share/classes/sun/launcher/resources/launcher_pt_BR.properties

Changeset: df20c60949f8
Author:    mfang
Date:      2012-03-12 16:42 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u4/jdk/rev/df20c60949f8

Merge