[fuse-encfs/f12/master: 10/10] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 9c7b26cf219e1b65006cc30a96d3871f0a0b8484
Merge: 7b8bc67 397863d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 5 22:52:41 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	fuse-encfs.spec

 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       |   39 +++++++++++++++++++++++++++------------
 sources               |    1 -
 6 files changed, 34 insertions(+), 32 deletions(-)
---