[amarok/f15/master: 4/4] Merge remote-tracking branch 'origin/master' into f15/master

[Rex Dieter]

commit 535b60fee26e598836fc9841bfd2e755144aa17e
Merge: 23ae8e0 f4adb68
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 6 12:53:59 2011 -0500

    Merge remote-tracking branch 'origin/master' into f15/master
    
    Conflicts:
    	amarok.spec

 .gitignore  |    2 ++
 amarok.spec |   21 ++++++++++++++-------
 sources     |    2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
---