Integrate own changes to mainline.
Nick Ing-Simmons [Sun, 24 Oct 1999 21:03:28 +0000 (21:03 +0000)]
p4raw-id: //depot/utfperl@4445


Trivial merge