OSDN Git Service

Merged r6163, r6171, r6172, r6174 from trunk.