OSDN Git Service

am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2