Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc