OSDN Git Service

am f6f1e5d2: resolved conflicts for merge of e3f01aff to eclair-mr2