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

[Peter Lemenkov]

commit 27e93e5c2fd33d758b13af6971878af144964c26
Merge: bba22c7 db547bf
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Feb 15 21:59:51 2011 +0300

    Merge branch 'master' into f13/master

 fuse.conf |    2 ++
 fuse.spec |   13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---