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

[leigh123linux]

commit a22221bd5918450a88cf6b51565a822e1b015649
Merge: 31f1283 a13ccb1
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 12:24:00 2012 +0000

    Merge branch 'master' into f17

 mate-vfs.spec |   94 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 47 insertions(+), 47 deletions(-)
---