This commit was generated by cvs2svn to compensate for changes in r3968,
authoryamaoka <yamaoka>
Sun, 2 Jul 2000 23:48:10 +0000 (23:48 +0000)
committeryamaoka <yamaoka>
Sun, 2 Jul 2000 23:48:10 +0000 (23:48 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge