K 10
svn:author
V 7
delphij
K 8
svn:date
V 27
2015-02-17T23:21:35.486173Z
K 7
svn:log
V 128
Fix build.  The merge should have been tested against an ICONV build.

Submitted by:	jbeich
Pointy hat to:	delphij
MFH:		2015Q1

END