Integrate with Sarathy.

p4raw-id: //depot/cfgperl@6196

diff --cc op.c
Simple merge

diff --cc perl.c
Simple merge

diff --cc perlapi.c
index 125c6e1,10a7a37..10a7a37
mode 100755,100644..100755
--- 1/perlapi.c
--- 2/perlapi.c
+++ b/perlapi.c

diff --cc toke.c
Simple merge