This commit was manufactured by cvs2svn to create tag 'r21-2-17'. r21-2-17
authortomo <tomo>
Thu, 24 Jun 1999 09:26:16 +0000 (09:26 +0000)
committertomo <tomo>
Thu, 24 Jun 1999 09:26:16 +0000 (09:26 +0000)

Trivial merge