Merge branch 'fuse_2_9_bugfix'

diff --cc ChangeLog
index 5eeb9fe0cc36ea1131fb62471fc0feb0edb274a3,4660598903b36f1c57cbdfca60fde7ab5dcdf86d..f2582bc3ae2ea6e88ddb0b638e64dbafc6c05053
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
+ 2012-08-13  Miklos Szeredi <miklos@szeredi.hu>
+ 
+       * Fix linking against GNU libiconv.  Patch by Natanael Copa
+ 
 +2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
 +
 +      * Start of 3.0 series.  This is going to be a new major version of
 +      the library breaking backward compatibility on the binary level as
 +      well as the source level.
 +
  2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
  
        * Released 2.9.1

diff --cc configure.in
Simple merge