Merge branch 'uclibc-iconv-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 17 Feb 2010 10:26:55 +0000 (11:26 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 17 Feb 2010 10:26:55 +0000 (11:26 +0100)

Trivial merge