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

[Rex Dieter]

Summary of changes:

  18e9b31... 4.8.4 (*)
  9821a82... 4.8.5 (*)
  7f85ecb... Merge branch 'master' into f17 (*)
  a7d979c... Merge branch 'f18' into f17 (*)
  d5d6b99... Merge branch 'f18' into f17 (*)
  10d3c9f... Merge branch 'f18' into f17 (*)
  259a772... Merge branch 'f18' into f17 (*)
  d161016... Merge branch 'f18' into f17 (*)

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