OSDN Git Service

Merge freedesktop/master into otc-private/master