RELEASE-1 merged into CURRENT

[Kaleb S. KEITHLEY]

Egbert Eich wrote:

> 2. One conflict I have not been able to resolve was the Japanese
>    Credits.rtf from the Darwin project. There were simply too many
>    conflicts and I don't speak RTF. I would like to ask Kaleb to
>    have a look at this file (I've used the version from the RELEASE-1
>    branch loosing all the changes that went into the CURRENT branch
>    since the split).

Or Torrey Lyons. I believe he added to the files after I did.

BTW, I'm on both release-wranglers and xorg -- no need to cc: me separately.

--

Kaleb