This commit was generated by cvs2svn to compensate for changes in r7534,
authortomo <tomo>
Sat, 1 Nov 2003 10:35:17 +0000 (10:35 +0000)
committertomo <tomo>
Sat, 1 Nov 2003 10:35:17 +0000 (10:35 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge