~vcs-imports/libiconv/trunk

1
ChangeLog	merge=merge-changelog