Takehiro Kubo wrote::
> How about the following patch which is a piece of one I posted to #633.

Thank you.  I committed it at r21182 with short ChangeLog entry.  If my
ChangeLog entry is wrong, please correct it.

Regards,
-- 
// SASADA Koichi at atdot dot net