44d26c8 fix cherry-pickup conflict

Authored and Committed by Mamoru Tasaka 11 years ago
1 file changed. 10 lines added. 3 lines removed.
    fix cherry-pickup conflict
    
        
file modified
+10 -3