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

[Peter Lemenkov]

commit 0c8a0e84d2124511585cdacd15c64ac212ccb5d1
Merge: 9217549 397863d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 5 22:53:52 2010 +0400

    Merge branch 'master' into el6/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(-)
---