Integrate from mainperl.

diff --cc MANIFEST
Simple merge
diff --cc lib/Pod/Html.pm
Simple merge
diff --cc pod/perldelta.pod
Simple merge
		1	2
MANIFEST	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Pod/Html.pm	patch \|	diff1 \|	diff2 \|	blob \| history
pod/perldelta.pod	patch \|	diff1 \|	diff2 \|	blob \| history