tujikawa - 2012-11-09

Patch attached.
I have currently no plan to merge this change to the trunk.