Changes in the English version(1.5->1.6) are merged.
Submitted by: Yoshiaki Uchikawa <yoshiaki@kt.rim.or.jp>