merge r30006
authorJo-Philipp Wich <[email protected]>
Fri, 3 Feb 2012 15:58:07 +0000 (15:58 +0000)
committerJo-Philipp Wich <[email protected]>
Fri, 3 Feb 2012 15:58:07 +0000 (15:58 +0000)
commitd2b7aea242b56277d6b818c2c5b38f0b3b5aa87f
treeed4b082acc7f7c941cb0e3cf6060f79d21e7b58f
parent36540540617574e336a47869151e82838415a5b1
merge r30006

SVN-Revision: 30017
libs/libiconv/Makefile
libs/libiconv/src/iconv.c