ChangeLog merge fix.