This commit was manufactured by cvs2svn to create tag 'r21-2-15'. r21-2-15
authortomo <tomo>
Sat, 5 Jun 1999 11:07:55 +0000 (11:07 +0000)
committertomo <tomo>
Sat, 5 Jun 1999 11:07:55 +0000 (11:07 +0000)

Trivial merge