This commit was manufactured by cvs2svn to create tag 'r21-4-21'. r21-4-21
authortomo <tomo>
Tue, 3 Jun 2008 09:15:12 +0000 (09:15 +0000)
committertomo <tomo>
Tue, 3 Jun 2008 09:15:12 +0000 (09:15 +0000)

Trivial merge