[mate-vfs/f17] (6 commits) ...Merge branches 'f17' and 'master' into f17

[Dan Mashal]

Summary of changes:

  d8fd9eb... add comment to files section (*)
  466433a... fix dependencies (*)
  c12647e... fix dependencies as per negative karma on bodhi (*)
  c5e6787... Merge branches 'master' and 'f17' (*)
  b903ee1... syncing branches (*)
  31f1283... Merge branches 'f17' and 'master' into f17

(*) This commit already existed in another branch; no separate mail sent