Integrate mainline.

p4raw-id: //depot/perlio@9181

diff --cc MANIFEST
Simple merge

diff --cc pod/perlmodlib.pod
index 8f3eb61,62d249a..15be6f2
--- 1/pod/perlmodlib.pod
--- 2/pod/perlmodlib.pod
+++ b/pod/perlmodlib.pod
@@@ -819,9 -799,10 +819,9 @@@ Most importantly, CPAN includes around 
  some of which require a C compiler to build.  Major categories of
  modules are:
  
- =over
+ =over 4
  
  =item *
 -
  Language Extensions and Documentation Tools
  
  =item *