- Merge the following from the English version:

	r45900 -> r45992	head/ja_JP.eucJP/share/xml/trademarks.ent
- Merge the following from the English version:

	r43819 -> r45989	head/ja_JP.eucJP/htdocs/where.xml