8bf698f Merge branch 'f16' into f17

Merged and Committed by dbhole 11 years ago
    Merge branch 'f16' into f17
    
    Updated to 1.2.1
    Resolves: RH840592/CVE-2012-3422
    Resolves: RH841345/CVE-2012-3423
    
        
file modified
+1 -0
file modified
+7 -2
file modified
+1 -1