Fix for gcc-4.5 c++0x

svn path=/sandbox/; revision=83201