[cvs-nhc98] patch applied (hat): Merge from stable-1-06-branch into the head.