OSDN Git Service

resolved conflicts for merge of ae77d6b6 to master