[mate-vfs: 5/5] Merge branches 'master' and 'f17'

[Dan Mashal]

commit c5e67870cf2a020a89694a6a83a8d215eb9e0b1e
Merge: c12647e 513aab0
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Aug 21 02:52:28 2012 -0700

    Merge branches 'master' and 'f17'
    
    Conflicts:
    	mate-vfs.spec

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