da85333 Merge branch 'master' into f15

Merged and Committed by Elio Maldonado 13 years ago
    Merge branch 'master' into f15
    
    - Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
    - nss security update for compromized certificates
    - see mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=642395
    
        
file modified
+4 -1
file modified
+1 -1