[quodlibet/f18: 5/5] Merge branch 'master' into f18

[hannes]

commit 90d08720e0defd34a416887ab325d012c796f742
Merge: fa5a803 a856506
Author: hannes <hannes at fedoraproject.org>
Date:   Wed Apr 24 19:48:30 2013 +0200

    Merge branch 'master' into f18
    
    Conflicts:
    	quodlibet-2.5-masked-library.patch
    
    Update to 2.5.1

 .gitignore                         |    2 +
 quodlibet-2.5-masked-library.patch |   64 ------------------------------------
 quodlibet.spec                     |   31 ++++++++++++++---
 sources                            |    4 +-
 4 files changed, 29 insertions(+), 72 deletions(-)
---