[libktorrent: 2/2] Merge branch 'f17'

[Rex Dieter]

commit a43708bcecbb3f14c4763863516e528f8622526b
Merge: a9f1435 648a0c0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 28 13:44:57 2012 -0600

    Merge branch 'f17'
    
    Conflicts:
    	libktorrent.spec

 libktorrent.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc libktorrent.spec
index 9b5e88e,ae96afe..57c6b68
--- a/libktorrent.spec
+++ b/libktorrent.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:    libktorrent
  Version: 1.2
- Release: 0.3.%{?pre}%{?dist}
 -Release: 0.3%{?pre}%{?dist}
++Release: 0.4.%{?pre}%{?dist}
  Summary: Library providing torrent downloading code
  
  Group:   System Environment/Libraries
@@@ -78,9 -78,9 +78,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 -* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.3rc1
++* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.4.rc1
+ - Rebuilt for c++ ABI breakage
+ 
 +* Fri Feb 10 2012 Rex Dieter <rdieter at fedoraproject.org> 1.2-0.3.rc1
 +- fix Release
 +
  * Fri Feb 10 2012 Alexey Kurov <nucleo at fedoraproject.org> - 1.2-0.2.rc1
  - fix performance issues