OSDN Git Service

MERGE: revision 1685 and 1690 from original repository