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

[Peter Lemenkov]

commit b1e6909a2980684b5dad0bb5367d90a403ca5f26
Merge: e58f2f5 51f9a3c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Apr 11 16:39:53 2011 +0400

    Merge branch 'master' into f14/master

 .gitignore          |    1 +
 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, 19 insertions(+), 8 deletions(-)
---