r21646: Patch from SATOH Fumiyasu <fumiyas@osstech.co.jp>