Merge remote-tracking branch 'origin/fuse_2_9_bugfix'

diff --cc ChangeLog
index 793a7a460ab14266e4ee1f348641983231f6e907,1b71fd42c4cc1b446108d7677a9c96c20249fb4d..753aaabde5d472fd93d30a515f6caaa9f3355cdb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,11 +1,33 @@@
 -2013-07-01  Miklos Szeredi <miklos@szeredi.hu>
+ 2013-08-26  Miklos Szeredi <miklos@szeredi.hu>
+ 
+       * libfuse: Add missing includes.  This allows compiling fuse with
+       musl.  Patch by Daniel Thau
+ 
 +2013-07-26  Miklos Szeredi <miklos@szeredi.hu>
  
 -      * Released 2.9.3
 +      * Print help on stdout instead of stderr
 +
 +2013-07-25  Miklos Szeredi <miklos@szeredi.hu>
 +
 +      * libfuse: fuse -> fuse3.  Allow 2.X and 3.X to coexist.  Includes
 +      are now stored under /usr/include/fuse3 and library is named
 +      libfuse3.*.  Invoke pkg-config with "fuse3" as the first argument
 +      to build with version 3 of the library.
 +
 +      * ulockmgr: strip ulockmgr support from this source package and
 +      distribute it separately.  It is not needed for the building of
 +      libfuse, only fusexmp_fh.  Check ulockmgr library in ./configure
 +      and if not disable remote-lock suport in fusexmp_fh.
 +
 +2013-07-24  Miklos Szeredi <miklos@szeredi.hu>
 +
 +      * libfuse: remove "-D_FILE_OFFSET_BITS=64" from fuse.pc, add
 +      AC_SYS_LARGEFILE to your configure.ac instead.
 +
 +2013-06-21  Miklos Szeredi <miklos@szeredi.hu>
 +
 +      * libfuse: set FD_CLOEXEC also when receiving device fd from
 +      fusermount
  
  2013-06-20  Miklos Szeredi <miklos@szeredi.hu>
  

diff --cc lib/fuse.c
Simple merge

diff --cc lib/fuse_lowlevel.c
index 0f1c3d3f8c63ab96a1b93ff7711dc0bf3e71140b,8853346d5f43968a3e977da88ceeb21d6c645037..2b8df06a2757d2a6d8bf88279d9b4a466c918f0b
mode 100755,100644..100755
--- 1/lib/fuse_lowlevel.c
--- 2/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c

diff --cc lib/mount_util.c
Simple merge

diff --cc util/fusermount.c
Simple merge