Merge ChangeLog from trunk better.