[soundconverter/f18: 3/3] Merge branch 'master' into f18

[Michael Schwendt]

commit 9f8c1b2a225f5cc49b5004e5d6a0fc2549f8f4d0
Merge: b70e288 d9d802d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Mar 5 00:50:37 2013 +0100

    Merge branch 'master' into f18

 soundconverter-2.0.4-fedora.patch |   19 ++++++++++---------
 soundconverter.spec               |    9 ++++++---
 2 files changed, 16 insertions(+), 12 deletions(-)
---