OSDN Git Service

resolved conflicts for merge of 8bdbbe2d to master