This commit was generated by cvs2svn to compensate for changes in r1479,
authortomo <tomo>
Tue, 6 Jun 2000 04:18:26 +0000 (04:18 +0000)
committertomo <tomo>
Tue, 6 Jun 2000 04:18:26 +0000 (04:18 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge