OSDN Git Service

Merge branch 'master' of yujiro_kaeko@git.sourceforge.jp:/gitroot/oca1/test.git
authoryujiro_kaeko <zyangalianhamster01@gmail.com>
Sat, 20 Aug 2011 15:01:53 +0000 (00:01 +0900)
committeryujiro_kaeko <zyangalianhamster01@gmail.com>
Sat, 20 Aug 2011 15:01:53 +0000 (00:01 +0900)

Trivial merge