Renamed patch for gcc4.7 fix.