[fuse/f13/master: 4/4] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit dfc9269f242330a1b054f9382087f8f59da771b4
Merge: 2e37b6b 8357eb9
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 26 15:14:27 2010 +0400

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore
    	fuse.spec
    	sources

 .gitignore |    1 +
 fuse.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---