OSDN Git Service

resolved conflicts for merge of d0514347 to master