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

[Peter Lemenkov]

commit 20edd37ba735988b46c28b12734fcf02777954e7
Merge: a4f658b 397863d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 5 22:48:41 2010 +0400

    Merge branch 'master' into f14/master

 encfs-1.5-const.patch |   12 ------------
 encfs-1.6-1.tgz.asc   |    7 -------
 encfs-1.7.1.tgz       |  Bin 0 -> 930790 bytes
 encfs-1.7.1.tgz.asc   |    7 +++++++
 fuse-encfs.spec       |   22 +++++++++++++---------
 sources               |    1 -
 6 files changed, 20 insertions(+), 29 deletions(-)
---