Merge mainline
Nick Ing-Simmons [Sat, 4 Nov 2000 21:55:13 +0000 (21:55 +0000)]
p4raw-id: //depot/perlio@7543

1  2 
MANIFEST

diff --cc MANIFEST
Simple merge