OSDN Git Service

resolved conflicts for merge of f30a09a7 to master