This commit was generated by cvs2svn to compensate for changes in r3225,
authoryamaoka <yamaoka>
Mon, 8 Nov 1999 23:15:08 +0000 (23:15 +0000)
committeryamaoka <yamaoka>
Mon, 8 Nov 1999 23:15:08 +0000 (23:15 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge