OSDN Git Service

Merge in xdiff cleanup pieces