JDK_1_5-Merge with HEAD: v_433
22 files changed