[mate-vfs/f18: 2/2] Merge branch 'master' into f18

[leigh123linux]

commit b5ce71358e790fca704922c72d7f49322fa5039e
Merge: 11e2c99 834e59a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 18:49:41 2012 +0000

    Merge branch 'master' into f18

 mate-vfs.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---