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

[Michael Schwendt]

commit 02fcafccc779e1b4f08690fa228036bdefeabff2
Merge: e33c1ed 39a5cf7
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 16 11:58:05 2011 +0100

    Merge branch 'master' into f14

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