Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.