[kdf/f18] (9 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  dc9c592... 4.8.4 (*)
  d1ba413... fix %_kde_version macro usage (*)
  bc00674... 4.8.5 (*)
  e6559e8... Merge branch 'master' into f17 (*)
  7849211... Merge branch 'f18' into f17 (*)
  96ffe2e... Merge branch 'f18' into f17 (*)
  38c1c8d... Merge branch 'f18' into f17 (*)
  6de731c... Merge branch 'f18' into f17 (*)
  0c656e5... Merge branch 'f18' into f17 (*)

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