[amarok/f14: 8/8] Merge branch 'master' into f14

[Rex Dieter]

commit 26115c884cc4bac8e4093ff944d8058c1fad5016
Merge: 660e88b bd3673c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 1 11:13:35 2011 -0500

    Merge branch 'master' into f14

 .gitignore  |    5 +----
 amarok.spec |   39 ++++++++++++++++++++++++++-------------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 18 deletions(-)
---