Merge branch 'master' of win:c:/ghc/git/cygwin/.
authorIan Lynagh <ian@well-typed.com>
Tue, 12 Mar 2013 18:19:22 +0000 (18:19 +0000)
committerIan Lynagh <ian@well-typed.com>
Tue, 12 Mar 2013 18:19:22 +0000 (18:19 +0000)

Trivial merge