[libkcddb/f18: 9/9] Merge branch 'master' into f18

[Rex Dieter]

commit 11c019097f62ec8e0cce20eaaa0ed4e09ec962ab
Merge: e81c610 d7f411a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 13:18:32 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	libkcddb.spec
    	sources

 .gitignore                                   |    6 +--
 libkcddb-4.9.98-libmusicbrainz5_cflags.patch |   55 ++++++++++++++++++++++++++
 libkcddb.spec                                |   35 +++++++++++++----
 sources                                      |    2 +-
 4 files changed, 84 insertions(+), 14 deletions(-)
---