Conflicts: contrib/hadoop/src/org/xtreemfs/common/clients/hadoop/XtreemFSFileSystem.java doc/xtreemfs-userguide/xtfs-guide.pdf doc/xtreemfs-userguide/xtfs-guide.tex