[mate-keyring/f17] (7 commits) ...Merge branch 'master' into f17

[leigh123linux]

Summary of changes:

  ed7be46... Fix directory ownership (*)
  068a623... Fix directory ownership (*)
  7dfc3c1... Fix directory ownership (*)
  8d06d83... Fix directory ownership (*)
  6115b70... Clean up (*)
  4cc918f... Clean up (*)
  8082932... Merge branch 'master' into f17

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