[soundconverter/f13/master: 10/10] Merge branch 'master' into f13

[Michael Schwendt]

commit b709ca288b2c2cf196b2cd759e490a61dd84b844
Merge: ce818d7 daa0b67
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Oct 28 18:37:39 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	soundconverter.spec

 soundconverter-1.5.3-bz647336.patch |  286 +++++++++++++++++++++++++++++++++++
 soundconverter.spec                 |    8 +-
 2 files changed, 293 insertions(+), 1 deletions(-)
---