merge more trivial differences from trunk so that I have a more readable diff output

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4296 4407c894-4637-0410-b4f5-ada5f102cad1