This commit was generated by cvs2svn to compensate for changes in r2834,
authoryamaoka <yamaoka>
Wed, 7 Jul 1999 21:54:19 +0000 (21:54 +0000)
committeryamaoka <yamaoka>
Wed, 7 Jul 1999 21:54:19 +0000 (21:54 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge