[mate-vfs/f18: 10/10] Merge branches 'f18' and 'master' into f18

[Dan Mashal]

commit 91d9cf2a79ab64d1a4eba5db813f03cf8890c533
Merge: 03fc80e b903ee1
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Aug 21 02:56:39 2012 -0700

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

 mate-vfs.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---