[cvs-nhc98] Merge from CVS head back into stable-1-06-branch: