From 807e3daa0a6e6a3bbc4353a223fed695a1e6dc2e Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 17 2011 00:57:39 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/audacious-plugins


Conflicts:
	audacious-plugins.spec

---

diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index e85687e..4c7e7fb 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.4.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -261,9 +261,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
-* Wed Feb 16 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.3-8
+* Wed Feb 16 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.3-9
 - Fix C++ static member init mess in adplug plugin (#669889).
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Feb  4 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.3-7
 - Enhance the audacious(plugin-api) stuff in the spec file and apply it
   to all subpackages.