JDK_1_5 - Merge with HEAD: v443
15 files changed