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