[kdiff3/f14] (7 commits) ...add kdiff3fileitemactionplugin

[Neal Becker]

Summary of changes:

  bf0a5a8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  da14e73... update to 0.9.96 (*)
  8aa3aca... update kdiff3part.desktop (*)
  16cc844... fix patch (*)
  e0e6055... remove patch1 (*)
  0dd4340... remove patch2 (*)
  713414f... add kdiff3fileitemactionplugin (*)

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