Hanh Le - Change to jdk1.6