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

[Peter Vrabec]

commit 4d267d5d6a5ca3f05acc15e268616f9dc9b94df4
Merge: 31a6214 fc11ae2
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Wed Oct 20 17:29:32 2010 +0200

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

 openscap.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc openscap.spec
index 4dfaab3,a8974b1..c04c5b7
--- a/openscap.spec
+++ b/openscap.spec
@@@ -150,9 -150,9 +150,12 @@@ f
  
  
  %changelog
 +* Wed Oct 20 2010 Peter Vrabec <pvrabec at redhat.com> 0.6.4-1
 +- upgrade
 +
+ * Wed Sep 29 2010 jkeating - 0.6.3-2
+ - Rebuilt for gcc bug 634757
+ 
  * Tue Sep 14 2010 Peter Vrabec <pvrabec at redhat.com> 0.6.3-1
  - upgrade