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

[Michael Schwendt]

commit dfbd179c8f9fd4f48bb458fd93bb865f9a421363
Merge: 4636a2f 8d17a56
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Apr 9 23:05:39 2011 +0200

    Merge branch 'f15' into f14

 ...cious-plugins-2.4.4-gtkui-import-playlist.patch |   30 ++++++++++++++++++++
 audacious-plugins.spec                             |    8 ++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---