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

[Rex Dieter]

commit 20ef86f255f2f00fbfe896a64acfce922761ef09
Merge: 0ebc982 769993f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 30 19:24:46 2010 -0500

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

 maxima.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc maxima.spec
index b05a728,3f33fab..9b50166
--- a/maxima.spec
+++ b/maxima.spec
@@@ -421,9 -421,9 +421,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Thu Sep 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 5.22.1-4
 +- rebuild (sbcl)
 +
+ * Wed Sep 29 2010 jkeating - 5.22.1-3
+ - Rebuilt for gcc bug 634757
+ 
  * Sat Sep 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 5.22.1-2 
  - rebuild (sbcl)