Integrate with Sarathy.

diff --cc op.c
Simple merge
diff --cc perl.c
Simple merge
diff --cc pod/perlfunc.pod
Simple merge
diff --cc toke.c
Simple merge
		1	2
op.c	patch \|	diff1 \|	diff2 \|	blob \| history
perl.c	patch \|	diff1 \|	diff2 \|	blob \| history
pod/perlfunc.pod	patch \|	diff1 \|	diff2 \|	blob \| history
toke.c	patch \|	diff1 \|	diff2 \|	blob \| history