This commit was manufactured by cvs2svn to create tag 'r21-4-22'. r21-4-22
authortomo <tomo>
Wed, 15 Jul 2009 06:58:55 +0000 (06:58 +0000)
committertomo <tomo>
Wed, 15 Jul 2009 06:58:55 +0000 (06:58 +0000)

Trivial merge