Merge the changes made to en version (1.6 -> 1.7).
Submitted by: Kiroh Harada <kiroh@kh.rim.or.jp> & Japanese Doc. Project