[ncmpcpp/f15: 4/4] Merge branch 'master' into f15

[Dominic Hopf]

commit 7bae465a092cb2a9f4f1897e75f83e6a41a6b788
Merge: 5ca60e2 3307ed0
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat Oct 15 02:05:33 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	ncmpcpp.spec
    	sources

 .gitignore   |    3 +--
 ncmpcpp.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---