[audacious-plugins/f14/master: 2/2] Merge branch 'master' into f14

[Michael Schwendt]

commit b157e748a3016e685e0a335fbd073f36a9324e84
Merge: 7b49b8f f8f7c61
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Feb 4 12:27:53 2011 +0100

    Merge branch 'master' into f14

 audacious-plugins.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---