This commit was manufactured by cvs2svn to create tag 'r21-4-20'. r21-4-20
authortomo <tomo>
Mon, 3 Sep 2007 07:45:18 +0000 (07:45 +0000)
committertomo <tomo>
Mon, 3 Sep 2007 07:45:18 +0000 (07:45 +0000)

Trivial merge