Integrate mainline, just to keep up.
Nick Ing-Simmons [Thu, 2 Jul 1998 18:36:59 +0000 (18:36 +0000)]
p4raw-id: //depot/ansiperl@1275


Trivial merge