03f34e3 Merge flash workaround

Authored and Committed by kwizart 11 years ago
    Merge flash workaround
    
        
file modified
+7 -1