c67249d Merge commit 'ea1929c25ae0d0879b3a509476057fb99bc6cc86' into f19

Merged and Committed by karsten 10 years ago
    Merge commit 'ea1929c25ae0d0879b3a509476057fb99bc6cc86' into f19
    
    Conflicts:
    	ed.spec
    
        
file modified
+1 -0
file modified
+12 -10
file modified
+1 -1