9695fc6 - sync with F-12 version to bring it up to 3.6.20

Authored and Committed by pmatilai 14 years ago
    - sync with F-12 version to bring it up to 3.6.20
    - fixes #531232 but avoid introducing #525477 on F-11
    
        
file modified
+2 -2
file modified
+8 -7