This commit was manufactured by cvs2svn to create tag 'r21-2-40'. r21-2-40
authortomo <tomo>
Tue, 14 Aug 2001 16:11:45 +0000 (16:11 +0000)
committertomo <tomo>
Tue, 14 Aug 2001 16:11:45 +0000 (16:11 +0000)

Trivial merge