Integrate mainline.
Nick Ing-Simmons [Fri, 30 Mar 2001 13:03:12 +0000 (13:03 +0000)]
p4raw-id: //depot/perlio@9466

1  2 
MANIFEST

diff --cc MANIFEST
Simple merge