Changes in the English version (1.25 -> 1.26) are merged.
Submitted by: Motoyuki Konno <motoyuki@snipe.rim.or.jp>