[cvs-nhc98] Merge from stable-1-06-branch.