Merge branch 'mn/maint-iconv-autoconf' into maint
commit6019b3ce8d178ed99d37b32cc2c523c25f0d58a1
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:14:25 +0000 (21 21:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:14:25 +0000 (21 21:14 -0700)
tree7d7684899c730b4c3e801a2cb7073f2d171150bc
parent44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc
parent934f82a7d424ea9a8fa0ae83020689d11efc2bff
Merge branch 'mn/maint-iconv-autoconf' into maint

* mn/maint-iconv-autoconf:
  fix handling of iconv configuration options