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

[Rex Dieter]

Summary of changes:

  751130c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  3fa6cca... - License: GPLv2 or GPLv3 (*)
  d80b7b8... 2.4.1 beta1 (*)
  73ab5d6... rebuild (mysql) (*)
  f4adb68... 2.4.1 (final) (*)
  660e88b... Merge remote-tracking branch 'origin/master' into f14/maste

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