0c8a0e8 Merge branch 'master' into el6/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into el6/master
    
    Conflicts:
    	.gitignore
    	fuse-encfs.spec
    
        
file removed
-7
file removed
-12
file added
+0
empty file added
file added
+7
file modified
+27 -12
file modified
+0 -1