Merge of mainline (does not build MULTIPLICITY/DEBUGGING issue).
Nick Ing-Simmons [Wed, 9 May 2001 09:46:37 +0000 (09:46 +0000)]
p4raw-id: //depot/perlio@10044


Trivial merge