Merge Taichi KAWABATA's patch [29 Dec 2004].