Merge branch 'master' into el6

Conflicts:
	.gitignore
	libmodplug.spec
	sources

.gitignore

@@ -1 +1 @@
-libmodplug-0.8.8.1.tar.gz
+/libmodplug-0.8.8.2.tar.gz

libmodplug.spec

@@ -1,6 +1,6 @@
 Name:           libmodplug
-Version:        0.8.8.1
+Version:        0.8.8.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -32,7 +32,7 @@ sed -i -e 's/\r//g' ChangeLog
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -67,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 1:0.8.8.2-1
+- Update to 0.8.8.2.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jun 21 2010 Ville Skyttä <ville.skytta@iki.fi> - 1:0.8.8.1-2
 - Make -devel main package dependency ISA qualified.
 

sources

@@ -1 +1 @@
-f7fa53a60c650024ff51cca88341776b  libmodplug-0.8.8.1.tar.gz
+e1fceac4c3bc26ebe96f619b46d26ff7  libmodplug-0.8.8.2.tar.gz