JDK_1_5-Merge with HEAD: v_411a
36 files changed