Merge in trunk @r2248-2267 to the branch because I missed
it the last time I merged.

TBR=evan


git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/cygwin@2451 4ff67af0-8c30-449e-8e8b-ad334ec8d88c