gcc-4.6-fixes
