r2114: Shameless theft of iconv commit from Samba4 to keep the two libs more in sync...