[fuse-encfs/f14/master: 4/4] merge in master changes

[jokajak]

commit a4f658b2868accec1ebc92c4467ee1b798fe9c07
Merge: b6f99ab 884e690
Author: Josh Kayse <jokajak at fedoraproject.org>
Date:   Mon Aug 2 12:59:04 2010 -0400

    merge in master changes

 .gitignore          |    1 +
 encfs-1.5-2.tgz.asc |    7 -------
 encfs-1.6-1.tgz.asc |    7 +++++++
 fuse-encfs.spec     |   14 ++++++++------
 sources             |    2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)
---