ChangeLog merge fix, grumble.