[dirac: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/dirac

[Nicolas Chauvet]

commit 13919f8533ce045f72f58b8a2b9065ed2dbadb66
Merge: f020076 e3d17d2
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Feb 11 16:22:50 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/dirac
    
    Conflicts:
    	dirac.spec

 dirac.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc dirac.spec
index ea47357,70b4b9e..70b2bbe
--- a/dirac.spec
+++ b/dirac.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           dirac
  Version:        1.0.2
--Release:        5%{?dist}
++Release:        6%{?dist}
  Summary:        Dirac is an open source video codec 
  
  Group:          System Environment/Libraries
@@@ -129,10 -124,9 +129,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Fri Feb 11 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.0.2-5
++* Fri Feb 11 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.0.2-6
 +- Backport Fix-uninitialised-memory-read
 +- Disable -Werror - solve FTBFS with gcc46
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Dec 08 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.0.2-4
  - Backport fix for gcc 4.5.0 - rhbz#660822