MinGW port: some questions

Hi,

I am looking at the MinGW port, and I see some rather strange changes
included in the port; "strange" in the sense that they do not appear to
have anything to do with MinGW.

I am referring, for example, to the changes from commit dc380d6, which
were reverted in Git mainline (actually in "next", they never reached
Git's "master").  Or to the changes from 4493e36, which had the same
fate.

Are these intentional?  Or are they the result of some strange mismerge?

	-az