This commit was manufactured by cvs2svn to create tag 'r21-2-25'. r21-2-25
authortomo <tomo>
Wed, 19 Jan 2000 05:07:49 +0000 (05:07 +0000)
committertomo <tomo>
Wed, 19 Jan 2000 05:07:49 +0000 (05:07 +0000)

Trivial merge