Merge branch 'master' of ssh://pkgs.fedoraproject.org/libbluray

Conflicts:
	libbluray.spec

libbluray.spec

@@ -4,7 +4,7 @@
 
 Name:           libbluray
 Version:        0.2
-Release:        0.3.%{tarball_date}git%{git_short}%{?dist}
+Release:        0.4.%{tarball_date}git%{git_short}%{?dist}
 Summary:        Library to access Blu-Ray disks for video playback 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -118,10 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat May 14 2011 Xavier Bachelot <xavier@bachelot.org> 0.2-0.3.20110514git46ee2766038e9
+* Sat May 14 2011 Xavier Bachelot <xavier@bachelot.org> 0.2-0.4.20110514git46ee2766038e9
 - Update to latest snapshot.
 - Drop -static subpackage.
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-0.3.20110126gitbbf11e43bd82e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Jan 26 2011 Xavier Bachelot <xavier@bachelot.org> 0.2-0.2.20110126gitbbf11e43bd82e
 - Update to latest snapshot.
 - Split the BDJ support to a -java subpackage.