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

[Michael Schwendt]

commit 134aaf83a99a18d1af1439dbe77da0c32ee45ffa
Merge: fff095a ac7da3d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Feb 17 20:11:11 2011 +0100

    Merge branch 'master' into f14

 audacious-plugins.spec |   54 ++++++++++++++++++++++++++++++++----------------
 sources                |    2 +-
 2 files changed, 37 insertions(+), 19 deletions(-)
---