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

[leigh123linux]

commit 382e7afbf4a93c604a77bde74c9cf6d3e456db4b
Merge: e6cd4c5 f0b644e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 18:41:14 2012 +0000

    Merge branch 'master' into f17

 mate-vfs.spec |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---