This commit was generated by cvs2svn to compensate for changes in r6817,
authoryamaoka <yamaoka>
Sun, 2 May 2004 00:17:17 +0000 (00:17 +0000)
committeryamaoka <yamaoka>
Sun, 2 May 2004 00:17:17 +0000 (00:17 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge