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

[Michael Schwendt]

commit 3c371761b28b439c7edff1ad3df512b1130255d7
Merge: 4411a0d 668c20c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Oct 7 20:40:26 2010 +0200

    Merge branch 'master' into f14

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---