This commit was manufactured by cvs2svn to create tag 'r21-4-15'. r21-4-15
authortomo <tomo>
Fri, 25 Jun 2004 16:13:18 +0000 (16:13 +0000)
committertomo <tomo>
Fri, 25 Jun 2004 16:13:18 +0000 (16:13 +0000)

Trivial merge