35c0553 merge changes

Merged and Committed by ovasik 11 years ago
    merge changes
    
        
file modified
+12 -38