JDK_1_5-Merge with HEAD: v_414
14 files changed