This commit was manufactured by cvs2svn to create tag 'r21-4-17'. r21-4-17
authortomo <tomo>
Sat, 9 Jul 2005 18:33:06 +0000 (18:33 +0000)
committertomo <tomo>
Sat, 9 Jul 2005 18:33:06 +0000 (18:33 +0000)

Trivial merge