This commit was manufactured by cvs2svn to create tag 'r21-4-22-chise- r21-4-22-chise-0_25-cns7-completed
authortomo <tomo>
Mon, 16 Apr 2012 13:51:15 +0000 (13:51 +0000)
committertomo <tomo>
Mon, 16 Apr 2012 13:51:15 +0000 (13:51 +0000)
0_25-cns7-completed'.


Trivial merge