[cxxtest/el6: 5/5] merge with master

[Martin Gieseking]

commit 3036ec6b3933015e30d8562ba9bc7e8ec5cac0f4
Merge: 70de799 c56bc5a
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Mon Dec 19 13:44:42 2011 +0100

    merge with master

 cxxtest-fix-abort.patch |   23 +++++++++++++++++++++++
 cxxtest.spec            |    8 +++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --cc cxxtest.spec
index 338350f,ea3d497..a894d4d
--- a/cxxtest.spec
+++ b/cxxtest.spec
@@@ -68,8 -75,11 +71,11 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Mon Dec 19 2011 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-5
+ - Fixed https://bugzilla.redhat.com/show_bug.cgi?id=768869
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.1-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +* Thu Jul 08 2010 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-4
 +- dropped exclude tags because of build failures on koji
  
  * Wed Aug 05 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-3
  - added exclude tags in files section