Integrate mainline.
Nick Ing-Simmons [Tue, 13 Mar 2001 21:26:30 +0000 (21:26 +0000)]
p4raw-id: //depot/perlio@9127

1  2 
MANIFEST

diff --cc MANIFEST
Simple merge