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

[Michael Schwendt]

commit 793c098d66a7e5686bea0f1d600145d1624f4072
Merge: 3c37176 066f05a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Oct 8 12:02:37 2010 +0200

    Merge branch 'master' into f14

 audacious-plugins-2.4.0-no-psf.patch     |    7 -
 audacious-plugins-2.4.0-psf-update.patch |19097 ++++++++++++++++++++++++++++++
 audacious-plugins.spec                   |   14 +-
 3 files changed, 19106 insertions(+), 12 deletions(-)
---