[ksaneplugin] (3 commits) ...fix merge (grr)

[Rex Dieter]

Summary of changes:

  6a517cb... 4.9.5 (*)
  c362aa1... Merge branch 'master' into f18 (*)
  98fb226... fix merge (grr) (*)

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