[kwallet/f18] (8 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  b2e7a12... 4.8.4 (*)
  c242d62... 4.8.5 (*)
  ab4dc5e... Merge branch 'master' into f17 (*)
  2eebd8b... Merge branch 'f18' into f17 (*)
  656586b... Merge branch 'f18' into f17 (*)
  f491f2b... Merge branch 'f18' into f17 (*)
  b9b592b... Merge branch 'f18' into f17 (*)
  2fa5540... Merge branch 'f18' into f17 (*)

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