[fuse-encfs/f13/master: 7/7] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit 715ebc9c2ec1dc5814aaed9391d46906fa0a9a18
Merge: dc2fc89 397863d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 5 22:51:08 2010 +0400

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

 encfs-1.5-2.tgz.asc   |    7 -------
 encfs-1.5-const.patch |   12 ------------
 encfs-1.7.1.tgz       |  Bin 0 -> 930790 bytes
 encfs-1.7.1.tgz.asc   |    7 +++++++
 fuse-encfs.spec       |   36 ++++++++++++++++++++++++------------
 sources               |    1 -
 6 files changed, 31 insertions(+), 32 deletions(-)
---