Re: [cvs-nhc98] merging nhc98 and yhc