[fuse-encfs: 6/6] Merge branch 'master' into el5

[Till Maas]

commit c64114413f05bbb75b5e67834873da0f8e3e5ba6
Merge: 40f538d d08a82f
Author: Till Maas <opensource at till.name>
Date:   Wed Jul 11 23:56:14 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	fuse-encfs.spec
    	sources

 .gitignore            |    2 +-
 encfs--rlog.diff      |  275 -------------------------------------------------
 encfs-1.4.2.tgz.asc   |    7 --
 encfs-1.5-const.patch |   12 --
 encfs-1.7.4.tgz.asc   |    7 ++
 fuse-encfs.spec       |  194 +++++++++++++++++++++++++++++-----
 sources               |    2 +-
 7 files changed, 174 insertions(+), 325 deletions(-)
---