Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5257

diff --cc op.c
Simple merge

diff --cc perlapi.c
index c4653cc,add96c4..add96c4
mode 100755,100644..100755
--- 1/perlapi.c
--- 2/perlapi.c
+++ b/perlapi.c