OSDN Git Service

Merge branch 'master' into kitagawa_cid
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 25 Apr 2012 11:11:14 +0000 (20:11 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 25 Apr 2012 11:11:14 +0000 (20:11 +0900)

Trivial merge