b5d610d resolve merge conflict

Merged and Committed by Mamoru Tasaka 11 years ago
    resolve merge conflict
    
        
file modified
+2 -0
file modified
+1 -3
file modified
+4 -1