Integrate mainline.
Nick Ing-Simmons [Mon, 19 Mar 2001 20:59:37 +0000 (20:59 +0000)]
p4raw-id: //depot/perlio@9249

1  2 
doop.c
sv.c

diff --cc doop.c
Simple merge
diff --cc sv.c
Simple merge