4a27edf Sync master with F17

Authored and Committed by mgrepl 11 years ago
    Sync master with F17
    
        
file modified
+10 -4
file modified
+0 -0
file modified
+70908 -3567
file modified
+535 -37