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

[Than Ngo]

commit a877d508a8d3035ca020579b5a53c9dffcee6987
Merge: 535c1f5 609d546
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 13:17:19 2013 +0100

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

 .gitignore       |    6 +-----
 audiocd-kio.spec |   23 ++++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)
---