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