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

[Michael Schwendt]

commit e33c1ed3515f2ab8d4c67565139596c799efbdf5
Merge: 8584886 3df9016
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Jan 15 23:29:10 2011 +0100

    Merge branch 'master' into f14

 .gitignore                                         |    2 +
 audacious-plugins-2.4-strip-m3u-lines.patch        |   14 -
 audacious-plugins-2.4.0-blur-scope-update.patch    |  525 -
 audacious-plugins-2.4.0-cue-crash-649645.patch     |   12 -
 audacious-plugins-2.4.0-neon-seek_end.patch        |   32 -
 audacious-plugins-2.4.0-psf-update.patch           |19097 --------------------
 ...ious-plugins-2.4.0-scrobbler-no-null.diff.patch |   61 -
 audacious-plugins-2.4.2-libnotify07.patch          |   12 +
 audacious-plugins.spec                             |   48 +-
 sources                                            |    2 +-
 10 files changed, 39 insertions(+), 19766 deletions(-)
---