[fuse-sshfs/el6: 6/6] Merge branch 'master' into el6

[Peter Lemenkov]

commit 74789e44777e8a698e2a0c1d6cf5abf711d3cce8
Merge: 1edf035 daf9ea0
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Sep 22 16:33:41 2011 +0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	fuse-sshfs.spec

 .gitignore      |    1 +
 fuse-sshfs.spec |   10 ++++++++--
 sources         |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---