This commit was generated by cvs2svn to compensate for changes in r6105,
authoryamaoka <yamaoka>
Mon, 14 Apr 2003 12:09:40 +0000 (12:09 +0000)
committeryamaoka <yamaoka>
Mon, 14 Apr 2003 12:09:40 +0000 (12:09 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge