Success: russian/hyphen v2004.04.15_1
*/hyphen: resolve conflicts
japanese/jpilot: resolve conflict