integrate cfgperl mods into mainline

p4raw-id: //depot/perl@1978

diff --cc Porting/genlog
index 5c3e905,5c3e905..b8bd1d6
--- 1/Porting/genlog
--- 2/Porting/genlog
+++ b/Porting/genlog
@@@ -107,8 -107,8 +107,9 @@@ EO
                my $files = $files{$branch}{$kind};
                # don't show large branches and integrations
                $files = ["($kind " . scalar(@$files) . ' files)']
--                  if (@$files > 25
--                      && ( $kind eq 'integrate' || $kind eq 'branch'));
++                  if (@$files > 25 && ($kind eq 'integrate'
++                                       || $kind eq 'branch'))
++                     || @$files > 100;
                print wrap(sprintf("%12s ", $editkind{$kind}),
                           sprintf("%12s ", $editkind{$kind}),
                           "@$files\n");

diff --cc op.c
Simple merge