2f575ee Merge remote-tracking branch 'origin/rhel-6.4' into rhel-7.0

Merged and Committed by cleech 11 years ago
    Merge remote-tracking branch 'origin/rhel-6.4' into rhel-7.0
    
    BZ #884424
    
    Inherited package from f18 is out of date compared to 6.4, carry over
    for alpha 3.  This will be replaced by newer f19 version developing in
    rawhide for beta.
    
        
file modified
+8 -16
file modified
+221 -130
file modified
+9 -2
file modified
+13 -4