Integrate mainline
Nick Ing-Simmons [Sat, 3 Nov 2001 11:42:15 +0000 (11:42 +0000)]
p4raw-id: //depot/perlio@12831

1  2 
perl.h
perlio.c

diff --cc perl.h
Simple merge
diff --cc perlio.c
Simple merge