[kdeplasma-addons] (7 commits) ...Merge branch 'master' into f19

[Rex Dieter]

Summary of changes:

  10188ba... 4.10.5 (*)
  fa3a8c5... drop the patch, it's included in 4.10.5 (*)
  f70d0d1... kdeobservatory requires qwt5-qt4, so add BuildConflicts: pk (*)
  fc7c01a... Revert "kdeobservatory requires qwt5-qt4, so add BuildConfl (*)
  fbd51de... Revert "drop the patch, it's included in 4.10.5" (*)
  b8ccf23... Revert "4.10.5" (*)
  15ecc2f... Merge branch 'master' into f19 (*)

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