[amarok/f15: 2/2] Merge branch 'master' into f15

[Rex Dieter]

commit f019b0cec7db96cd52f617e51d96d6813826e6ae
Merge: f827320 d9f764e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 16 15:16:05 2011 -0500

    Merge branch 'master' into f15

 amarok.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---