Integrate mainline (in near desperate attempt to get Win32 to build...)
Nick Ing-Simmons [Fri, 22 Jun 2001 15:33:37 +0000 (15:33 +0000)]
p4raw-id: //depot/perlio@10828


Trivial merge