[phonon/f14/master] (4 commits) ...Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

Summary of changes:

  da3f158... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  ee6b391... phonon-4.5.0 qt-designer-plugin-phonon moved here (from qt) (*)
  35685be... avoid Conflicts with judicious (Build)Requires: qt4(-devel) (*)
  abe8f8f... Merge remote-tracking branch 'origin/master' into f14/maste

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