Merged with gcc-4_4-branch@151281.