Merged /branches/1.1:r1297-1317 to /trunk.


git-svn-id: http://mintty.googlecode.com/svn/trunk@1318 2782a51e-c42b-11dd-927d-974589228060