[audiocd-kio/f17: 8/8] Merge branch 'master' into f17

[Than Ngo]

commit b04196c707757605d7578c10a08459eac9ae2fa4
Merge: 535c1f5 609d546
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 14:08:22 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	audiocd-kio.spec
    	sources

 .gitignore       |    1 +
 audiocd-kio.spec |   23 ++++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index d39f56b,27fff2e..88a4d1e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,1 +1,6 @@@
 +/audiocd-kio-4.9.1.tar.xz
 +/audiocd-kio-4.9.2.tar.xz
 +/audiocd-kio-4.9.3.tar.xz
 +/audiocd-kio-4.9.4.tar.xz
 +/audiocd-kio-4.9.5.tar.xz
+ /audiocd-kio-4.10.1.tar.xz