[libksane] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  b952f9f... 4.11.4 (*)
  3dd36d4... 4.11.5 (*)
  316cc68... Revert "4.11.5" (*)
  4256ca6... Revert "4.11.4" (*)
  9e4440d... Merge branch 'master' into f20 (*)

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