Make CHANGES in CVS head consistent with the CHANGES files in the