[fuse-encfs/el6/master: 4/4] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit c251964d432904ed1de4bb221080caef457fc1e2
Merge: 150d3ec 51f9a3c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Apr 11 16:42:59 2011 +0400

    Merge branch 'master' into el6/master
    
    Conflicts:
    	.gitignore

 .gitignore          |    2 ++
 encfs-1.7.2.tgz     |  Bin 930420 -> 0 bytes
 encfs-1.7.2.tgz.asc |    7 -------
 encfs-1.7.4.tgz.asc |    7 +++++++
 fuse-encfs.spec     |   11 ++++++++++-
 sources             |    1 +
 6 files changed, 20 insertions(+), 8 deletions(-)
---