JDK_1_5-Merge with HEAD: v_418
7 files changed