Integrate mainline.
Nick Ing-Simmons [Sun, 25 Mar 2001 09:01:57 +0000 (09:01 +0000)]
p4raw-id: //depot/perlio@9338

1  2 
MANIFEST

diff --cc MANIFEST
Simple merge