This commit was generated by cvs2svn to compensate for changes in r6593,
authoryamaoka <yamaoka>
Mon, 5 Jan 2004 00:13:03 +0000 (00:13 +0000)
committeryamaoka <yamaoka>
Mon, 5 Jan 2004 00:13:03 +0000 (00:13 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge