This commit was manufactured by cvs2svn to create tag 'merged-trunk-to-wl- merged-trunk-to-wl-2_12
authortomo <tomo>
Wed, 15 Dec 2004 14:32:54 +0000 (14:32 +0000)
committertomo <tomo>
Wed, 15 Dec 2004 14:32:54 +0000 (14:32 +0000)
2_12'.


Trivial merge