[libmusicbrainz3/f14/master: 6/6] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 8c59dbe8b4dcc52c24c73770681f6c317b1fa7a5
Merge: 061888b 1f21470
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 18 08:58:02 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	libmusicbrainz3.spec

 doxygen-footer.html  |    2 --
 libmusicbrainz3.spec |   27 +++++++++++++--------------
 2 files changed, 13 insertions(+), 16 deletions(-)
---