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

[leigh123linux]

commit 2915da118c7d276baf5e6db875c64db0ab8efacb
Merge: 65c904c d761878
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 12:54:03 2012 +0000

    Merge branch 'master' into f18

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