Add 'registered' and 'trademark' to mapPrivateUseChars (bug 925985)
Remove unneeded |oldtypes| variable from bidi.js.
Merge pull request #4367 from nnethercote/rm-oldtypes

Remove unneeded |oldtypes| variable from bidi.js.
Merge pull request #4362 from Snuffleupagus/bug-925985

Add 'registered' and 'trademark' to mapPrivateUseChars (bug 925985)