[libmusicbrainz3/f13/master: 8/8] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit fed2ec9b1455d67f4b76115020fdef47bac8213c
Merge: 949db31 1f21470
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 18 09:01:01 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore                         |    1 +
 doxygen-footer.html                |    2 -
 libmusicbrainz-3.0.1-private.patch |   12 ---------
 libmusicbrainz-3.0.2-gcc44.patch   |   11 --------
 libmusicbrainz3.spec               |   46 +++++++++++++++++------------------
 sources                            |    2 +-
 6 files changed, 24 insertions(+), 50 deletions(-)
---