This commit was generated by cvs2svn to compensate for changes in r12232,
authortomo <tomo>
Tue, 3 Jun 2008 09:15:11 +0000 (09:15 +0000)
committertomo <tomo>
Tue, 3 Jun 2008 09:15:11 +0000 (09:15 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge