Integrate from mainperl.

diff --cc pod/perl5005delta.pod
Simple merge
diff --cc pod/perldiag.pod
Simple merge
diff --cc pod/perlfunc.pod
Simple merge
diff --cc util.c
Simple merge
		1	2
pod/perl5005delta.pod	patch \|	diff1 \|	diff2 \|	blob \| history
pod/perldiag.pod	patch \|	diff1 \|	diff2 \|	blob \| history
pod/perlfunc.pod	patch \|	diff1 \|	diff2 \|	blob \| history
util.c	patch \|	diff1 \|	diff2 \|	blob \| history