This commit was generated by cvs2svn to compensate for changes in r1312,
authoryamaoka <yamaoka>
Sun, 25 Oct 1998 23:08:13 +0000 (23:08 +0000)
committeryamaoka <yamaoka>
Sun, 25 Oct 1998 23:08:13 +0000 (23:08 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge