<Swing Dev> hg: jdk7/swing/jdk: 6953294: Fix for 6909002 was incorrectly merged

[yuka.kamiya at sun.com]

Changeset: 57d7b80faad8
Author:    peytoia
Date:      2010-05-18 16:40 +0900
URL:       http://hg.openjdk.java.net/jdk7/swing/jdk/rev/57d7b80faad8

6953294: Fix for 6909002 was incorrectly merged
Reviewed-by: okutsu

! make/com/sun/Makefile
- make/com/sun/inputmethods/Makefile
- make/com/sun/inputmethods/indicim/Makefile
- make/com/sun/inputmethods/thaiim/Makefile
- src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java
- src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java
- src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethod.java
- src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java
- src/share/classes/com/sun/inputmethods/internal/indicim/java.awt.im.spi.InputMethodDescriptor
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_fr.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ja.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_sv.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_CN.properties
- src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties
- src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethod.java
- src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java
- src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodImpl.java
- src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiRules.java
- src/share/classes/com/sun/inputmethods/internal/thaiim/java.awt.im.spi.InputMethodDescriptor
- src/share/classes/com/sun/inputmethods/internal/thaiim/resources/DisplayNames.properties