OSDN Git Service

resolved conflicts for merge of f22cedb7 to master