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

[Rex Dieter]

Summary of changes:

  af13237... 4.8.4 (*)
  e44d1fe... 4.8.5 (*)
  54ad6fc... Merge branch 'master' into f17 (*)
  229ff11... Merge branch 'f18' into f17 (*)
  6b2e62c... Merge branch 'f18' into f17 (*)
  93a6c38... Merge branch 'f18' into f17 (*)
  ab6914c... Merge branch 'f18' into f17 (*)
  bf2bd5e... Merge branch 'f18' into f17 (*)

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