Integrate mainline (part2 - the deletes)
Nick Ing-Simmons [Mon, 18 Jun 2001 08:05:29 +0000 (08:05 +0000)]
p4raw-id: //depot/perlio@10678


Trivial merge