88d0fa1 fix merge conflic

Merged and Committed by Mamoru Tasaka 11 years ago
    fix merge conflic
    
        
file modified
+1 -0
file modified
+11 -13
file modified
+1 -1