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

[Michael Schwendt]

commit 85848863d1f20d44120b835cf5d0ede40503950d
Merge: a740be1 b790c5f
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Nov 4 16:40:38 2010 +0100

    Merge branch 'master' into f14

 audacious-plugins-2.4.0-cue-crash-649645.patch |   12 ++++++++++++
 audacious-plugins.spec                         |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---