[digikam] (5 commits) ...Merge branch 'master' into f18

[Rex Dieter]

Summary of changes:

  00ab80a... rebuild (opencv) (*)
  8002ea4... disable broken nepomuk support (#832483) (*)
  1fa985e... cleanup, remove old conditional, Conflicts (*)
  7619bde... Resolves #891515, build marble deps on Fedora only (*)
  186075a... Merge branch 'master' into f18 (*)

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