[gvfs/f17: 5/5] fix merge

[Peter Robinson]

commit e363ca704888682e9d720bfabf7a118957a36c83
Merge: c00dbe2 ede7905
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Apr 12 09:08:28 2012 +0100

    fix merge

 gvfs.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---