I've merged the unicode-internal code into the trunk.