Reorganize the ChangeLog entries of the last big merge.