merge the mingw gcc 4.1 diff