[boost: 2/2] Merge remote-tracking branch 'origin/master'

[Petr Machata]

commit 078021db9167adf2da828cbb5e3ca6aa789a479e
Merge: 7a52c34 d901bcf
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Feb 8 19:40:33 2011 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	boost.spec

 boost.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc boost.spec
index e4fdff0,d4871f9..98c154a
--- a/boost.spec
+++ b/boost.spec
@@@ -23,7 -23,7 +23,7 @@@ Name: boos
  Summary: The free peer-reviewed portable C++ source libraries
  Version: 1.46.0
  %define version_enc 1_46_0_beta1
--Release: 0.2.beta1%{?dist}
++Release: 0.3.beta1%{?dist}
  License: Boost
  
  # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@@ -834,10 -831,9 +834,13 @@@ find $RPM_BUILD_ROOT%{_includedir}/ \( 
  %{_bindir}/bjam
  
  %changelog
- * Tue Feb  8 2011 Petr Machata <pmachata at redhat.com> - 1.46.0-0.2.beta1
++* Tue Feb  8 2011 Petr Machata <pmachata at redhat.com> - 1.46.0-0.3.beta1
 +- spirit.patch: Fix a problem in using boost::spirit with utf-8
 +  strings.  Thanks to Hicham HAOUARI for digging up the fix.
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46.0-0.2.beta1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Thu Feb  3 2011 Petr Machata <pmachata at redhat.com> - 1.46.0-0.1.beta1
  - Package 1.46.0-beta1
  - Reintroduce the soname patch