f8c4be1 Merge remote branch 'origin/master' into f12/master

Merged and Committed by rdieter 13 years ago
    Merge remote branch 'origin/master' into f12/master
    
    Conflicts:
    	amarok.spec
    
        
file modified
+21 -6