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

[leigh123linux]

commit e6cd4c5e384f80d13e6d4b0f3b474ef1d033e3a7
Merge: a22221b d761878
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 12:54:28 2012 +0000

    Merge branch 'master' into f17

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