- Merge the following from the English version:

	r24989 -> r45697	head/ja_JP.eucJP/share/xml/trademarks.ent


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@45856 c2e8774f-c49f-e111-b436-862b2bbc8956