OSDN Git Service

resolved conflicts for merge of 6dd2ae02 to eclair