ChangeLog: Updated after the merge.