OSDN Git Service

resolved conflicts for merge of d7b15982 to master