This commit was generated by cvs2svn to compensate for changes in r4336,
authoryamaoka <yamaoka>
Thu, 11 Jan 2001 22:33:47 +0000 (22:33 +0000)
committeryamaoka <yamaoka>
Thu, 11 Jan 2001 22:33:47 +0000 (22:33 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge