Integrate mainline.
Nick Ing-Simmons [Tue, 27 Mar 2001 20:15:43 +0000 (20:15 +0000)]
p4raw-id: //depot/perlio@9387

1  2 
MANIFEST

diff --cc MANIFEST
Simple merge